summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Power off only when initialization failedHEADreplicant-4.2-0004replicant-4.2-0003replicant-4.2Paul Kocialkowski2014-08-031-1/+2
| | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* NativeNfcManager: Properly unconfigure NFC chipreplicant-4.2-0002Paul Kocialkowski2014-06-302-0/+5
| | | | | Change-Id: I8da74ff64579181387b3905c29e5d4dca9e9e7eb Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* fixed inconsistant defines that are supposed to match tagtechnology.javadoug yeager2013-02-211-2/+2
| | | | Change-Id: If3afc9a3d46fe3780261d029caac18d242718e38
* Merge tag 'android-4.2.2_r1' of ↵Steve Kondik2013-02-1213-799/+1163
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Nfc into 1.1 Android 4.2.2 release 1
| * Snapshot b80adb2c263702442cf2f2d771168400e6ceb9f8The Android Open Source Project2012-12-1313-799/+1163
| | | | | | | | Change-Id: I391d8e1be1a61e68b01f0db371dbb4ed3e5b5933
* | nfc: Add alternate firmware pathSteve Kondik2013-02-061-0/+5
| | | | | | | | | | | | * So we stay bug-for-bug compatible with OEMs. Change-Id: I0c14568d9f587ebcd2d21c0f0490b705be7ce8ce
* | Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-12-270-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Nfc into aosp Conflicts: nci/src/com/android/nfc/dhimpl/NativeNfcManager.java src/com/android/nfc/NfcService.java Change-Id: I52a73c696c003e8ccf513977968a42d917acf87a
| * Snapshot 1a6bcf3cca90fedfbad33c1cdd6d05af5774fc01The Android Open Source Project2012-12-1360-313/+17536
| | | | | | | | Change-Id: I3ccb25bf7cde2c22f52260cae0e9957517e6bb5f
* | Merge branch 'jb-mr1-release' of ↵Steve Kondik2012-11-2181-371/+17683
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Nfc into HEAD Conflicts: nxp/jni/com_android_nfc_NativeNfcManager.cpp Change-Id: Ic84af6ad1cda79984f40e9fc464d2cbaa994b89a
| * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-290-0/+0
| |\ \
| | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | |\ \
| | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | |\ \
| | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | |\ \
| | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | |\ \
| | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-130-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | | | | | | | |\ \ | | | | | | | | | | |/ / | | | | | | | | | |/| |
| | | | | | | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-070-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-050-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-040-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-030-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-020-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-010-0/+0
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-270-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-260-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * | | Don't hold the routing wakelock longer than a minute.Martijn Coenen2012-09-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until we figure out why routing gets stuck, don't hold the wakelock indefinitely. Bug: 7113095 Change-Id: If4d1ed8d8855e2b50ddae6d06e886faf0d58db6d
| | | | | | | | | | | | | | | | | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-190-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-120-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-090-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-290-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-08-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Serialize applying card emulation route.Martijn Coenen2012-10-251-1/+10
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of immediately applying the routing, serialze the request with any outstanding commands (including NFC enable/disable). This prevents race conditions when NFC is being disabled and the card emu routing gets changed at the same time. Wait until the AsyncTask is complete, to make sure that the routing is applied (if possible) by the time the call returns. Bug: 7418238 Change-Id: I7d92533179c02f4b6b01a86967737e64532317a1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock during initialisation.Martijn Coenen2012-10-241-45/+75
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NCI stack may do firmware download as part of the intilization call. Make sure we don't suspend while the download is in progress. Also, hold a wakelock over the entire EEwipe procedure. This prevents suspending in the middle. Bug: 7407558 Change-Id: I2034c8292414dc7db20a0c19951d44021389adea
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay sending EE-wipe APDUs.Martijn Coenen2012-10-231-0/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around an issue where sending the wipe APDUs at the same time as the SE sends its HCI configuration to the NFCC can cause the persistent HCI state to become incorrect. Bug: 7387638 Change-Id: I11a73e3ad7875c5b1d755efde0a7a803427b7468
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong Beam image scaling on sw600 and larger devices.Martijn Coenen2012-10-231-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On sw600 and larger, the navbar is at the bottom, not to the side. Bug: 7399926 Change-Id: I825a1156995ec6e84faef16866dea4bf240a11c2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset RF field status on SE activation.Martijn Coenen2012-10-221-0/+5
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've seen the NFCC get in a state where it continuously reports field off/field on events. The danger is that the device goes to sleep right after a field on event. On wake-up, the field off/field on loop is gone, and the device prevents any access to the SE from the DH because it thinks the field is still present. Bug: 7386840 Change-Id: I87b681124078fe69c0244efd7b14ebe3ffd1c161
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Beam animation for non-owner user." into jb-mr1-devMartijn Coenen2012-10-163-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-05-04 05:39:06 +0000