summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | 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
| | | |\| | | | | | | | |
| | | | * | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-120-0/+0
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-100-0/+0
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-050-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-040-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-020-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-280-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | Hold mutex before waiting on condition variable.Martijn Coenen2013-08-221-0/+1
| | | | | | | | | | * | | | | | | | | Fix out of bounds access.Martijn Coenen2013-08-221-1/+1
* | | | | | | | | | | | | | | | | | | Merge "Add BLUETOOTH_PRIVILEGED permission." into klp-devMartijn Coenen2013-10-081-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add BLUETOOTH_PRIVILEGED permission.Martijn Coenen2013-10-081-0/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
* / | | | | | | | | | | | | | | | | Fix NPE in NfcService.Martijn Coenen2013-10-071-1/+3
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-053-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-043-4/+4
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Increase reader mode pull duration." into klp-devMartijn Coenen2013-10-043-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Increase reader mode pull duration.Martijn Coenen2013-10-043-9/+8
* | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-10-028-8/+8
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Notify NfcService on NFA_DEACTIVATED_EVT." into klp-devMartijn Coenen2013-10-012-1/+1
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Notify NfcService on NFA_DEACTIVATED_EVT.Martijn Coenen2013-10-012-1/+1
* | | | | | | | | | | | | | | | Merge "Make CardEmulation APIs work even if NFC is off." into klp-devMartijn Coenen2013-10-012-0/+12
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Make CardEmulation APIs work even if NFC is off.Martijn Coenen2013-10-012-0/+12
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* / | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-3056-0/+58
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | HCE: invalidate cache if passed in service unknown.Martijn Coenen2013-09-262-6/+40
* | | | | | | | | | | | | Latest HCE UX.Martijn Coenen2013-09-257-36/+53
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-195-10/+10
|/ / / / / / / / / / /
* | | | | | | | | | | Merge "Reject invalid AIDs." into klp-devMartijn Coenen2013-09-182-14/+45
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Reject invalid AIDs.Martijn Coenen2013-09-182-14/+45
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1640-480/+240
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1456-5/+913
|/ / / / / / / /
* | | | | | | | Merge "Fix build." into klp-devMartijn Coenen2013-09-121-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix build.Martijn Coenen2013-09-121-1/+2
* | | | | | | | | Merge "Reader API: disable LPTD on NCI devices when in reader mode." into klp...Martijn Coenen2013-09-122-17/+49
|\| | | | | | | |
| * | | | | | | | Reader API: disable LPTD on NCI devices when in reader mode.Martijn Coenen2013-09-122-17/+49
* | | | | | | | | Merge "Fix NFCEE access on NCI devices." into klp-devMartijn Coenen2013-09-123-8/+19
|\| | | | | | | | | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix NFCEE access on NCI devices.Martijn Coenen2013-09-123-8/+19
* | | | | | | | Merge "Remove dependency on JNIHelp header side effects." into klp-devRuben Brunk2013-09-128-1/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-108-1/+15
| | |/ / / / / | |/| | | | |
* | | | | | | HCE: Latest UX designs, strings.Martijn Coenen2013-09-1112-67/+170
| |/ / / / / |/| | | | |
* | | | | | Merge "Remove support for legacy APIs." into klp-devMartijn Coenen2013-09-102-10/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove support for legacy APIs.Martijn Coenen2013-09-042-10/+1
* | | | | | Fix BT headset pairing crash.Martijn Coenen2013-09-041-0/+4
| |/ / / / |/| | | |
* | | | | Implement reader mode API for NXP chipsets.Martijn Coenen2013-09-035-9/+87
|/ / / /
* | | | Changes for callback model of reader mode APIs.Martijn Coenen2013-09-035-50/+78
* | | | Upgrade to new API changes.Martijn Coenen2013-08-307-55/+99
|/ / /
* / / HCE: API updates, default handling, lock-screen.Martijn Coenen2013-08-299-138/+190
|/ /
* | Implement reader mode APIs.Martijn Coenen2013-08-277-35/+212
* | Hold mutex before waiting on condition variable.Martijn Coenen2013-08-221-0/+1