summaryrefslogtreecommitdiffstats
path: root/nci/src/com
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-211-0/+12
| | | | | | | | | https://android.googlesource.com/platform/packages/apps/Nfc into HEAD Conflicts: nxp/jni/com_android_nfc_NativeNfcManager.cpp Change-Id: Ic84af6ad1cda79984f40e9fc464d2cbaa994b89a
* am a949c743: Fast-fail SE open if it\'s activated in listen mode.Martijn Coenen2012-10-111-0/+8
|\ | | | | | | | | * commit 'a949c74321b17f8ef1c93692064969f60815c7e4': Fast-fail SE open if it's activated in listen mode.
| * Fast-fail SE open if it's activated in listen mode.Martijn Coenen2012-10-111-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users of the NFC-extras API usually want to talk to the SE once it has completed a transaction. The hard part is knowing when it is safe to connect to the SE, as it will break the connection to any reader. And when relinquishing the connection to the SE, the reader may find the device again and process another transaction. This patch adds the following two conditions for allowing to open the SE from the DH: 1) The SE may not be activated in listen mode 2) The RF field must have been off for at least 50 ms Bug: 7275484 Change-Id: Ibde32a8e2aef045c17ab76ef08c72f96edfedaef
* | Set EE wipe APDUs for NCI stack.Martijn Coenen2012-10-081-1/+13
| | | | | | | | | | | | | | | | | | | | | | The wipe APDUs are used to lock the Secure Element state whenever an app using the SE is deinstalled, when all userdata is removed, or on first boot of the device. This sequence is identical for both the NXP and NCI implementations. Bug: 7312675 Change-Id: I746580985bc986ac159e0d294823f0dbe6d3404f
* | NfcAdapterExtras: add driver name.mike wakerly2012-10-031-0/+7
|/ | | | | Bug: 7276355 Change-Id: If2732afd542a68dc440308dae9eb76eb7ff31e25
* Power up the NFCC when DH wants to talk to the SE.Paul Chaisson2012-09-301-2/+0
| | | | | | | | We need to allow usecases were the DH wants to talk to the SE even if the screen is off. Bug: 7257431 Change-Id: Iad66ef29757985b7aab5f0748fbf7589b3777bc3
* Allow different default MIU / window sizes.Martijn Coenen2012-08-071-3/+17
| | | | | | | The new NCI stack can deal with larger MIU and rw sizes, which give us better p2p throughput. Change-Id: I6600f28ddafe142b64ead2df896823bb8d242fc5
* Follow-up NFC code drop.Martijn Coenen2012-07-301-47/+1
| | | | | | | From partner, uploaded 07/26/2012; modified to fit in new dhimpl/jni split. Change-Id: I3a8c04ab9427adc1295b7b46ec1308f98a2c2c5e
* NFC: Initial NCI DeviceHost and JNI implementation.Martijn Coenen2012-07-277-0/+1570
From partner drop at 07/20. Modified to fit into our new JNI/DH split. New build config that builds two targets, Nfc and NfcNci, each with their own dependencies. Product config files have to specify either Nfc or NfcNci in their packages config. Change-Id: I348a3aad7167195ca03baf9636408ab8e4c55fce