| 5f28e5ee8f39bd58e182f911ebb50960b2a77830 |
|
27-Apr-2017 |
Joe Onorato <joeo@google.com> |
Turn off logspam
These logs are the 8th most popular logs when the screen is turned off. And when you actually use
NFC, all other users of logcat are pushed out.
For more information, see https://source.android.com/source/code-style#log-sparingly
Also: Fix coding style. No space after function or macro name.
Bug: 37252687
Test: development/tools/logblame/power_toggle_test
Change-Id: Id7212abeee5ee05a5916dfd8685c90fbe2cca8f5
Turn off logspam
For more information, see https://source.android.com/source/code-style#log-sparingly
Bug: 37252687
Test: development/tools/logblame/app_switch_test
Test: development/tools/logblame/power_toggle_test
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| c5956ce2009414eef843b413eeb822b529ddb85c |
|
27-Jan-2017 |
Ruchi Kandoi <kandoiruchi@google.com> |
Use _OverrideLog.h instead of OverrideLog.h
This is a temporary hack to prevent the ordering. This is needed because
OverrideLog.h needs to be included first and clang-format would change
the order.
Test: compiles
Change-Id: Ide07e814e7e1be8d7d8a89f634d855938ed5adab
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| 2dfff7620070cff76fb117aafcd06e57cceb59fb |
|
15-Dec-2016 |
Ruchi Kandoi <kandoiruchi@google.com> |
Changes data types to standard type
Data types were changed using platform/system/bt/tools/scripts/change_types.sh:
UINT8->uint8_t
UINT16->uint16_t
UINT32->uint32_t
UINT64->uint64_t
INT8->int8_t
INT16->int16_t
INT32->int32_t
INT64->int64_t
Test: Compiles
Change-Id: I04b6c7b7836145033537aa2af27e18311b3c6d91
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| ed5ec08dfaf4080d69a1a04b00d1e3c54d2d78a6 |
|
25-Feb-2016 |
Aurimas Liutikas <aurimas@google.com> |
Fix all the warnings in packages/apps/Nfc/nci/jni.
Bug: 26936282
Change-Id: I797b1ee866b3d7fe5ebb025c6256e9c3a838fd95
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| ced053fa28b925c55e4fdf45783895dfe1bd500e |
|
09-Jun-2015 |
Jizhou Liao <Jizhou.Liao@nxp.com> |
Fix peer-to-peer server register error if RF discovery is started.
If RF discovery is started, discovery should be temporarily stopped before deregister peer-to-peer server
Change-Id: I42c826454f050e09b3d673b89560a8c7bed728d7
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| 2daeeee63456a515693980372908234e1fa14ba5 |
|
15-Apr-2015 |
Martijn Coenen <maco@google.com> |
Expose peer LLCP version to apps.
Change-Id: Id5ea699a8508b5bdf44c0bae2d38893e2c42241a
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| b5a6c9615433734869c7a73a06c1b3799ebe0c9f |
|
06-Jun-2014 |
Martijn Coenen <maco@google.com> |
JNI code from Broadcom.
Contribution from Evan Chu <evanchu@broadcom.com>.
Changes made to make it build with current tree:
- Removed deferred start/stop logic (no SE code in AOSP).
- Removed separate enable/disable implementations (no SE code in AOSP).
- Removed second option for P2P workarounds with PN5xx as it's not used.
Change-Id: Ia33e3fa29b09dca2f6d2721307edde746605da54
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| 53ee4de0f77a55b13359a5c44166377a126a2c85 |
|
25-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Fix warnings in the JNI code
Change-Id: I5bd8198e4f61fbddf0ff7e42d8ce55f54d8aed12
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| a8aa07142ea0078d3ae4ae486e094e2f2f4ff732 |
|
27-Mar-2013 |
Evan Chu <evanchu@broadcom.com> |
Sync up with Broadcom JNI changes.
Patches contributed by Evan Chu<evanchu@broadcom.com>
and Paul Chaisson<pchaisson@broadcom.com>.
Bug: 10360038
Change-Id: I1402191406b08e097680f8c7f587f393f749184e
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| 57a44d07a3de327e8cdbbcd622118aa517313dbe |
|
28-Mar-2013 |
Martijn Coenen <maco@google.com> |
Deal with pre-MR2 PN544 NXP stack LLCP bugs.
In MR2 we started connecting LLCP on link
activation instead of when the send was confirmed. Pre-MR2
NXP-stack devices have a bug that causes them to only
send the first SYMM after 750 ms (in case they are the
initiator). There is another bug that causes that same stack
to crash if two threads try to send a packet at the same
time.
Unfortunately, this combination of factors creates the
following race:
1) pre-MR2 PN544-initiator initiates p2p link with MR2 device
2) pre-MR2 PN544-initiator starts Touch to Beam animation
3) pre-MR2 PN544 doesn't have data to send, but delays SYMM for 750ms
4) MR2 device finally gets SYMM after 750ms, and sends CONNECT PDU
5) pre-MR2 PN544-initiator device responds to CONNECT PDU with CC on Thread 1
6) Within a ~50 ms window, the user on the pre-MR2 PN544-initiator touches
the screen to confirm the send. This causes Thread 2 to try to send
something, which fails.
As a result, the Beam transaction fails. Unfortunately
this is quite easy to reproduce, since the Beam animation takes
about 750ms, just the same amount of time it takes for the SYMM
to get sent.
To prevent such a race condition, we should make sure that we do
not create multi-threaded access on the remote device. The best way
to do that is to not connect the LLCP services automatically when
talking to a pre-MR2 PN544-initiator.
Long story short, when we don't receive a first packet of data
after 200 ms, we consider the remote device to be a buggy
implementation, and delay the connect until the time the user
decides to send something (in which case it's fine - it's unlikely
the user at the other side tries to send something at exactly the
same time).
Also fixed RF field notifications to be more robust; whenever
p2p is activated, we disable field events, and always treat the
field as being on.
Bug: 8508568
Change-Id: I41b427afb24c7f8d228adc91d258cca553539588
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| ead6b34f0bdc6506533db2f5c2fa07d001417f42 |
|
11-Mar-2013 |
Martijn Coenen <maco@google.com> |
Increase LLCP data-link connection timeout to 2000 ms.
Some older PN544-based solutions would only send the first SYMM back
(as an initiator) after the full LTO (750ms). But our connect timer
starts immediately, and hence we may timeout if the timer is set to
1000 ms. Worse, that causes us to immediately connect to the NPP
socket, causing concurrency issues in the NXP stack. Increase the default
timeout to 2000 ms, giving us enough time to complete the first connect.
Change-Id: I1e45ebd2f97dc6bb362e2bfea3a42445f69ad59d
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| 803eb6ae8cd5b2ac3ffe010a3ced9018bf0b3d1d |
|
22-Dec-2012 |
Elliott Hughes <enh@google.com> |
am f843d899: Merge "Fix NFC JNI local reference and pin table leaks."
* commit 'f843d8995fb94bdb1059061bad650c21ffd3588e':
Fix NFC JNI local reference and pin table leaks.
|
| 2534d9a546f24435d9dab8168f9ea5bf8ca1eb9b |
|
18-Dec-2012 |
Elliott Hughes <enh@google.com> |
Fix NFC JNI local reference and pin table leaks.
Also turn compiler warnings up and fix the easy ones.
Bug: http://code.google.com/p/android/issues/detail?id=20441
Change-Id: I1043300f344b8296cfbb6bfad17388d5c3b314d1
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| be1939b4b6003ac7a65fcb95a3912f5e1ce8e75f |
|
14-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8
Change-Id: I391d8e1be1a61e68b01f0db371dbb4ed3e5b5933
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|
| 525c260303268a83da4c3413b953d13c9084e834 |
|
14-Dec-2012 |
The Android Open Source Project <initial-contribution@android.com> |
Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01
Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
/packages/apps/Nfc/nci/jni/PeerToPeer.cpp
|