summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-11.0-XNG3Cstable/cm-11.0-XNG2SMichael Bestas2015-02-151-3/+3
| | | | Change-Id: I93e4bea7749b0f1d264e308923b56b1fdab55186
* Automatic translation importMichael Bestas2015-01-191-0/+3
| | | | Change-Id: Iea0af7f087b86bf201826d9e24da8d0660d01843
* Automatic translation importMichael Bestas2015-01-112-4/+1
| | | | Change-Id: I18b840c26c73c311c2846774ab26ecacbfc9e953
* Automatic translation importMichael Bestas2015-01-031-1/+1
| | | | Change-Id: Ibc8bc05cd6c2725be86ecbc3b436ddb6edeb96f6
* Adding MiFARE DESFire format supportJizhou Liao2014-10-297-13/+254
| | | | | | | | | | | | Fix semantic error when deregister P2P if discovery has started This patch is to disable discovery before deregister P2P and re-enable discovery after that. Code inspection fixes Remove unused class memeber and avoid variable uninitialized. Change-Id: I2da3a37c98de3e4f36cfcd1061d060ef14f4e00a
* Automatic translation importMichael Bestas2014-10-152-0/+55
| | | | Change-Id: If41f5a441f75afd03d25194f3bd0a42b77ca1590
* Automatic translation importMichael Bestas2014-08-234-5/+5
| | | | Change-Id: I119b0f794de04ca84bb4fa815635ff245487fa40
* Automatic translation importMichael Bestas2014-08-091-0/+10
| | | | Change-Id: I36a62a8e2a5a0d5acde42a190ebc68379067485f
* Automatic translation importMichael Bestas2014-07-242-1/+40
| | | | Change-Id: Ib1b3e3fcb0e9fa49f7d21218c89cf0510c41cc64
* Automatic translation importMichael Bestas2014-06-301-0/+7
| | | | Change-Id: I9a5237ebb57711c87a129337cadd07bef4e4dc3e
* Automatic translation importMichael Bestas2014-06-221-38/+0
| | | | Change-Id: I86efa27a8e6296e91fc131c224126445f3af1d6c
* Merge tag 'android-4.4.3_r1' into HEADRicardo Cerqueira2014-06-034-18/+14
|\ | | | | | | Android 4.4.3 release 1
| * Fix compiler warnings (DO NOT MERGE).Nick Kralevich2014-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | packages/apps/Nfc/nci/jni/RoutingManager.cpp: In member function 'bool RoutingManager::addAidRouting(const UINT8*, UINT8, int)': packages/apps/Nfc/nci/jni/RoutingManager.cpp:123:94: warning: format '%s' expects a matching 'char*' argument [-Wformat=] ALOGE ("%s: failed to route AID"); ^ packages/apps/Nfc/nci/jni/RoutingManager.cpp: In member function 'bool RoutingManager::removeAidRouting(const UINT8*, UINT8)': packages/apps/Nfc/nci/jni/RoutingManager.cpp:139:95: warning: format '%s' expects a matching 'char*' argument [-Wformat=] ALOGE ("%s: failed to remove AID"); Bug: 13476133 Change-Id: I6765bc68a7d8c2180cf8dd2f587d302cac314538
| * DO NOT MERGE Fix NPE in RegisteredAidCacheYuka Anami2014-03-141-1/+4
| | | | | | | | | | | | | | If the specified AID is not matched to any of mAidCache's keys, the HashMap returns null and then NullPointerException occurs. Bug: 13322965 Change-Id: I0d97aab0e47a6c6e7cbdb2426173038f4194c457
| * Import translations. DO NOT MERGEBaligh Uddin2014-02-201-1/+1
| | | | | | | | | | Change-Id: I3b39f521bc29c9ca0208d67c66b6f95679d2ce6c Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2013-12-121-14/+7
| | | | | | | | | | Change-Id: I8b06d43cb18a2cb1e8e735b6d78515ccca670006 Auto-generated-cl: translation import
* | nxp: Include support declaration for Mifare tagsRicardo Cerqueira2014-05-301-0/+10
| | | | | | | | | | | | | | | | Older chipsets requiring the NXP stack are also known to be compatible with mifare classics, so just push the feature declaration Change-Id: I5017cff14ca37b2b7f7b8638de1b58253c0b10e5
* | Merge "Nfc : Switch to notification sound" into cm-11.0Danesh M2014-05-212-12/+4
|\ \
| * | Nfc : Switch to notification soundDanesh M2014-05-202-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the notification sound, since the service might get unbound before the sound has had a chance to finish This fixes the issue where on beam completes, the notification sound is cancelled before it finishes. Change-Id: I6c00f43ed17dc7fadf27da58e3f95f540be8d22e
* | | Automatic translation importMichael Bestas2014-05-213-0/+50
|/ / | | | | | | Change-Id: I0e1c491c9ed4aa9ee771ca3faa82aa9033a2ae73
* | Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-069-25/+77
|\| | | | | | | Android 4.4.1 Release 1
| * Increase NFC-A guard time to work around B5 issue.Martijn Coenen2013-11-061-0/+29
| | | | | | | | | | | | | | | | Increase NFC-A guard time in reader mode, to make sure we properly wake up BCM20791B05 devices. Bug: 10852675 Change-Id: Ia30972d5d7850171bc58068c5d6896025eb6c2c1
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-283-14/+14
| | | | | | | | | | Change-Id: Ibfd34791605d53500be71f7c09223e198370fbf0 Auto-generated-cl: translation import
| * HCE: Fix potential crash and handle Android AID.Martijn Coenen2013-10-232-0/+23
| | | | | | | | | | | | | | | | | | | | For new "default route" CTS test. Also, fix a potential crash for starting off-host services and check that HCE services have declared the NFC permission. Bug: 10681671 Change-Id: If86d9820d6eef5a0661be92be67168d5f81ddc64
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-212-10/+10
| | | | | | | | | | Change-Id: I930a2209b1b7e2fcc03ed448b0abcb127b70b86b Auto-generated-cl: translation import
| * Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-171-1/+1
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-10-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I443b01b550cb0e1d98818db042dcb1c8fbd19059 Auto-generated-cl: translation import
| * | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ | | |/ | |/|
* | | Nfc: UG translation.sahranbay2013-11-171-0/+38
| |/ |/| | | | | Change-Id: Iaac13a2df91ad666060bac5e3e1655f6697d847d
* | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
|\ \ | |/ |/|
| * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| |\
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-070-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | | | | |\
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | |\
* | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-121-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia70dd60758f95b07085ba70e5631c5f93ff9da68 Auto-generated-cl: translation import
* | | | | | | | | | Merge "Disable HCE debug logging." into klp-devMartijn Coenen2013-10-094-28/+80
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Disable HCE debug logging.Martijn Coenen2013-10-094-28/+80
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But add some code to dump information about the HCE service/AID cache in bugreports. Bug: 11142134 Change-Id: I7387748bcf93e92ab2f25bc307941cdeccaca4ef
* | | | | | | | | merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge in klp-factoryrom-release history after reset to klp-releaseThe Android Automerger2013-09-160-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ merge in KQS81MEd Heyl2013-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-190-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | |/| | | | | | | | | | | | |/|/ / / / / / / / / /
| | | * | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-160-0/+0
| | | |\| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 07:49:12 +0000