summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge "Re-enable dynamic UICC idle timeout switching." into jb-mr2-devMartijn Coenen2013-03-271-0/+6
| |\ \ \
| | * | | Re-enable dynamic UICC idle timeout switching.Martijn Coenen2013-03-271-0/+6
| * | | | Merge "Update JNI to work with latest stack drop." into jb-mr2-devMartijn Coenen2013-03-273-47/+36
| |\| | |
| | * | | Update JNI to work with latest stack drop.Martijn Coenen2013-03-273-47/+36
| | |/ /
| * / / Update to new IPC API for getting data to share.Martijn Coenen2013-03-261-5/+14
| |/ /
| * | Import translations. DO NOT MERGEBaligh Uddin2013-03-251-1/+1
| * | Don't dynamically enable/disable UICC timeout.Martijn Coenen2013-03-181-6/+0
| |/
| * Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-03-1441-80/+41
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2013-03-1241-80/+41
| * | Wait for UICC_IDLE config event to complete.Martijn Coenen2013-03-132-37/+32
| |/
| * Merge "Disable UICC_IDLE feature when host is talking to SE." into jb-mr2-devMartijn Coenen2013-03-111-0/+13
| |\
| | * Disable UICC_IDLE feature when host is talking to SE.Martijn Coenen2013-03-111-0/+13
| * | Increase LLCP data-link connection timeout to 2000 ms.Martijn Coenen2013-03-111-1/+10
| |/
| * Merge "Allow incoming provisioning intents while in setup wizard." into jb-mr...Martijn Coenen2013-03-084-18/+126
| |\
| | * Allow incoming provisioning intents while in setup wizard.Martijn Coenen2013-03-074-18/+126
| * | Import translations. DO NOT MERGEBaligh Uddin2013-03-0648-21/+98
| * | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-03-0638-76/+38
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-03-0438-76/+38
| * | | Merge "Make Beam more forgiving." into jb-mr2-devMartijn Coenen2013-03-055-9/+153
| |\ \ \ | | |/ / | |/| |
| | * | Make Beam more forgiving.Martijn Coenen2013-03-045-9/+153
| | |/
| * / Import translations. DO NOT MERGEBaligh Uddin2013-03-0148-3/+99
| |/
| * Merge "Immediately connect to LLCP services." into jb-mr2-devMartijn Coenen2013-03-014-120/+397
| |\
| | * Immediately connect to LLCP services.Martijn Coenen2013-02-284-120/+397
| * | Add Beam progress indicator.Martijn Coenen2013-02-283-34/+93
| |/
| * Merge "Revert "Add ACCESS_NETWORK_STATE permission.""Martijn Coenen2013-02-231-1/+0
| |\
| | * Revert "Add ACCESS_NETWORK_STATE permission."Martijn Coenen2013-02-221-1/+0
| * | Merge "Add ACCESS_NETWORK_STATE permission."Martijn Coenen2013-02-221-0/+1
| |\|
| | * Add ACCESS_NETWORK_STATE permission.Martijn Coenen2013-02-221-0/+1
| * | Merge "Support for Kovio tags via NfcBarcode API class"Martijn Coenen2013-02-225-3/+23
| |\|
| | * Support for Kovio tags via NfcBarcode API classEvan Chu2013-02-225-3/+23
| * | Merge "Split Surface/SurfaceControl fallout"Mathias Agopian2013-02-141-1/+2
| |\ \
| | * | Split Surface/SurfaceControl falloutMathias Agopian2013-02-131-1/+2
| * | | Merge "Catch all exceptions when doing remote Binder calls."Martijn Coenen2013-02-141-4/+5
| |\ \ \ | | |/ / | |/| |
| | * | Catch all exceptions when doing remote Binder calls.Martijn Coenen2013-02-131-4/+5
| | |/
| * | Merge "Return more accurate errors for NfcEe.open."Martijn Coenen2013-02-134-18/+61
| |\ \ | | |/ | |/|
| | * Return more accurate errors for NfcEe.open.Martijn Coenen2013-02-124-18/+61
| * | am edd2eaf9: am be1aec0a: Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_...Martijn Coenen2013-02-111-2/+2
| |\ \ | | |/ | |/|
| | * am be1aec0a: Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LI...Martijn Coenen2013-02-111-2/+2
| | |\
| | | * Merge "Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIES"Martijn Coenen2013-02-121-2/+2
| | | |\
| | | | * Use LOCAL_REQUIRED_MODULES instead of LOCAL_JNI_SHARED_LIBRARIESChih-Wei Huang2012-12-211-2/+2
| * | | | Add a bit more logging for Bluetooth Beam.Martijn Coenen2013-01-184-4/+18
| * | | | Use bindServiceAsUser() to follow API change.Amith Yamasani2013-01-161-4/+4
| * | | | Merge "Fix emergency_recovery logic."Martijn Coenen2013-01-101-1/+1
| |\ \ \ \
| | * | | | Fix emergency_recovery logic.Martijn Coenen2013-01-101-1/+1
| * | | | | Enforce foreground NDEF push.Martijn Coenen2013-01-072-28/+68
| |/ / / /
| * | | | am 803eb6ae: am f843d899: Merge "Fix NFC JNI local reference and pin table le...Elliott Hughes2012-12-2823-916/+722
| |\| | |
| | * | | am f843d899: Merge "Fix NFC JNI local reference and pin table leaks."Elliott Hughes2012-12-2123-916/+722
| | |\| |
| | | * | Merge "Fix NFC JNI local reference and pin table leaks."Elliott Hughes2012-12-2123-916/+722
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fix NFC JNI local reference and pin table leaks.Elliott Hughes2012-12-1823-916/+722
| | | |/
| * | / Snapshot 81cfc41a448a57d0b3e16b817dc074e91ae94188The Android Open Source Project2012-12-137-45/+41
| |/ /