summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-09-13Merge cherrypicks of [2891339, 2891340, 2891341, 2891342, 2891354, 2891355, 2...android-6.0.1_r81marshmallow-mr2-releaseandroid-build-team Robot
2017-09-13Add READ_EXTERNAL_STORAGE for file based Uri while beaming.Ruchi Kandoi
2017-03-15Merge remote-tracking branch 'goog/security-aosp-mnc-mr1-release' into HEADandroid-6.0.1_r80Bill Yi
2016-06-24Allow system_server access to NFC reader mode API.Martijn Coenen
2016-06-23Allow system_server access to NFC reader mode API.android-6.0.1_r79android-6.0.1_r78android-6.0.1_r74android-6.0.1_r70android-6.0.1_r66android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58Martijn Coenen
2016-05-27Verify setForegroundDispatch caller is in foreground.android-6.0.1_r72android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r49Martijn Coenen
2016-05-24Verify setForegroundDispatch caller is in foreground.Martijn Coenen
2015-10-20Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...android-6.0.1_r9android-6.0.1_r8android-6.0.1_r7android-6.0.1_r46android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r20android-6.0.1_r17android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r41marshmallow-mr1-devThe Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Merge branch 'klp-modular-dev' of /usr/local/google/game/mirror/googleplex-an...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-20Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f am...The Android Open Source Project
2015-10-19Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73fThe Android Open Source Project
2015-10-19Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8The Android Open Source Project
2015-10-19Reconcile with jb-mr0-release am: 29b858a5d6The Android Open Source Project
2015-10-19Reconcile with jb-mr0-releaseThe Android Open Source Project
2015-10-19Merge "Don't enable reader mode when NFC is disabled." into mnc-dr-devMartijn Coenen
2015-10-19Don't enable reader mode when NFC is disabled.Martijn Coenen
2015-10-13Use global all-cpp-files-underDan Willemsen
2015-09-24Import translations. DO NOT MERGEmarshmallow-dr-devBaligh Uddin
2015-09-23Grant WiFi override permission to NFC process.Martijn Coenen
2015-09-18Import translations. DO NOT MERGEBaligh Uddin
2015-08-28Support Mifare Classic tag.Jizhou Liao
2015-08-24am 14687fef: Fix crash when invoking Beam with NFC off.Martijn Coenen
2015-08-24Fix crash when invoking Beam with NFC off.marshmallow-devMartijn Coenen
2015-08-24Fix peer-to-peer server register error if RF discovery is started.Jizhou Liao
2015-08-20Support Mifare DESFire tag formatJizhou Liao
2015-08-03Fix conflict vendor proprietary definitions.Jizhou Liao
2015-07-29am 79458517: Fix NFC onManualBeamInvoke issue with policyAlex Chau
2015-07-29Merge "Reset P2P flag in de-initialization." into mnc-dr-devMartijn Coenen
2015-07-29Fix NFC onManualBeamInvoke issue with policyAlex Chau
2015-07-23Reset P2P flag in de-initialization.Jizhou Liao
2015-07-22am 0fdfe750: Use a foreground priority broadcast to hand over data to bluetooth.Nicolas Prevot
2015-07-21Use a foreground priority broadcast to hand over data to bluetooth.Nicolas Prevot
2015-07-15am b7a8d179: (-s ours) Import translations. DO NOT MERGEGeoff Mendal
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 17:58:39 +0000