summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importHEADreplicant-6.0-0004-rc1cm-13.0Abhisek Devkota2017-12-143-0/+120
* Add READ_EXTERNAL_STORAGE for file based Uri while beaming.replicant-6.0-0003Ruchi Kandoi2017-09-201-2/+18
* Automatic translation importAbhisek Devkota2017-09-201-13/+4
* Automatic translation importreplicant-6.0-0002replicant-6.0-0001Abhisek Devkota2017-04-281-23/+2
* Automatic translation importAbhisek Devkota2017-02-201-0/+40
* Automatic translation importpinky@build012016-09-251-0/+3
* Automatic translation importpinky@build012016-08-290-0/+0
* Automatic translation importpinky@build012016-08-273-0/+120
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-2/+3
|\
| * Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-231-2/+3
* | Nfc: read extra properties of Mifare ClassicHamster Tian2016-07-151-0/+11
* | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+8
|\ \ | |/
| * Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-271-1/+8
* | Revert "Nfc: Clear transfer manager service on Destroy"Roman Birg2016-06-101-1/+0
* | Revert "nfc: create a bootstrap service"Roman Birg2016-06-102-41/+0
* | NFC: Adding new vendor specific interface to NFC ServicePuneet Mishra2016-05-231-0/+10
* | Automatic translation importAbhisek Devkota2016-05-171-0/+1
* | Nfc: Clear transfer manager service on DestroyPat Erley2016-05-171-0/+1
* | Revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/pla...Michael Bestas2016-05-018-15/+15
* | Automatic translation importMichael Bestas2016-04-161-0/+40
* | Automatic translation importMichael Bestas2016-04-051-0/+40
* | Automatic translation importMichael Bestas2016-03-272-0/+80
* | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-118-15/+15
|\ \
| * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| |\ \
| | * \ Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project2015-10-200-0/+0
| | |\ \ | | | |/
| * | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| |\ \ \ | | |/ /
| | * | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project2015-10-200-0/+0
| | |\ \
| * | \ \ am f08a81c4: Merge "Don\'t enable reader mode when NFC is disabled." into mnc...Martijn Coenen2015-10-191-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Don\'t enable reader mode when NFC is disabled." into mnc-dr-devMartijn Coenen2015-10-191-0/+4
| | |\ \ \
| * | \ \ \ am a590e214: am e208aeb6: Use global all-cpp-files-underDan Willemsen2015-10-141-12/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am e208aeb6: Use global all-cpp-files-underDan Willemsen2015-10-141-12/+1
| | |\ \ \ \
| * | \ \ \ \ am faea766f: (-s ours) am 30931b14: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 30931b14: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ \ \ \ \
| * | \ \ \ \ \ am 405f1723: am 8415fed4: Grant WiFi override permission to NFC process.Martijn Coenen2015-09-231-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 8415fed4: Grant WiFi override permission to NFC process.Martijn Coenen2015-09-231-0/+1
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ am 899ca873: (-s ours) am aa7adaeb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am aa7adaeb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ am 8c9730a8: am 8605731e: Support Mifare Classic tag.Jizhou Liao2015-08-3128-44/+15050
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 8605731e: Support Mifare Classic tag.Jizhou Liao2015-08-3128-44/+15050
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ am ac4db9ce: am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC ...Martijn Coenen2015-08-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC off.Martijn Coenen2015-08-241-1/+1
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ am e66316f6: am c5eec3c6: Fix peer-to-peer server register error if RF discov...Jizhou Liao2015-08-242-0/+29
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am c5eec3c6: Fix peer-to-peer server register error if RF discovery is started.Jizhou Liao2015-08-242-0/+29
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am c132ac72: am fbbf1131: Support Mifare DESFire tag formatJizhou Liao2015-08-243-5/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am fbbf1131: Support Mifare DESFire tag formatJizhou Liao2015-08-243-5/+94
| | |\ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ am 3e88d804: am 26e1bc78: Fix conflict vendor proprietary definitions.Jizhou Liao2015-08-032-240/+215
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am 26e1bc78: Fix conflict vendor proprietary definitions.Jizhou Liao2015-08-032-240/+215
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ am 3ddd88c5: am b896d429: am 79458517: Fix NFC onManualBeamInvoke issue with ...Alex Chau2015-07-291-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am b896d429: am 79458517: Fix NFC onManualBeamInvoke issue with policyAlex Chau2015-07-291-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ am 363a666a: am c336a8c4: Merge "Reset P2P flag in de-initialization." into m...Martijn Coenen2015-07-291-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /