summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004cm-13.0Michael Bestas2019-08-1014-642/+194
| | | | Change-Id: I74fdb662be3387107ce4f19882a575b4ecdbc26f
* Automatic translation importreplicant-6.0-0004-rc1Abhisek Devkota2017-12-133-0/+120
| | | | Change-Id: I49a5f0c38c0cefac1531aaba5bf5dfb5f61056d9
* Add READ_EXTERNAL_STORAGE for file based Uri while beaming.replicant-6.0-0003Ruchi Kandoi2017-09-201-2/+18
| | | | | | | | | Test: PoC application Bug: 37287958 Change-Id: I7f5a2f32a053f0448726aec9f8b524f914c0d8df Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com> (cherry picked from commit dc54140e12f441c9d7c1b5be5337d6b16bfa32e4) CVE-2017-0784
* Automatic translation importAbhisek Devkota2017-09-191-13/+4
| | | | Change-Id: I95ae5930c13ec9407e4cab09519e593d0e41ac15
* Automatic translation importreplicant-6.0-0002replicant-6.0-0001Abhisek Devkota2017-04-281-23/+2
| | | | Change-Id: Iccc54752562f96e725e16bfd4a4d5ba4f32d961a
* Automatic translation importAbhisek Devkota2017-02-191-0/+40
| | | | Change-Id: I9c596590c9d338ec143ba6f734f2ee202b30a7ca
* Automatic translation importpinky@build012016-09-251-0/+3
| | | | | Change-Id: Iad4267ed9d9bb463f2e7d961f6a25ce43fee175d Ticket: -
* Automatic translation importpinky@build012016-08-290-0/+0
| | | | | Change-Id: I63633e2018d7d881f1362acf9cc0f67c9ecfd6f4 Ticket: -
* Automatic translation importpinky@build012016-08-273-0/+120
| | | | | Change-Id: I205f629dd4eadfa403f686d5390dc180dea40dfc Ticket: -
* Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-021-2/+3
|\ | | | | | | | | | | Android 6.0.1 Release 61 (MOB30Z) Change-Id: I7b6b664eab962509733953d0acf2b0c092d3c926
| * Allow system_server access to NFC reader mode API.Martijn Coenen2016-06-231-2/+3
| | | | | | | | | | Bug: 29451566 Change-Id: I26b0a2e9b33854efd59b95ab230a6db3042f93c7
* | Nfc: read extra properties of Mifare ClassicHamster Tian2016-07-151-0/+11
| | | | | | | | | | | | * Fixes NFC TagInfo crash with MFC and native NFC stack. Change-Id: Ib5042f6969d34070fbf0b54b26596b86eda1cd26
* | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+8
|\| | | | | | | | | | | Ticket: CYNGNOS-3020 Change-Id: Id4da9854964b94fcbac1ff2e890ff7329bd3815d
| * Verify setForegroundDispatch caller is in foreground.Martijn Coenen2016-05-271-1/+8
| | | | | | | | | | Bug: 28300969 Change-Id: Icadfe70cd06f921badd266e7a4efbae15a8c206a
* | Revert "Nfc: Clear transfer manager service on Destroy"Roman Birg2016-06-101-1/+0
| | | | | | | | | | | | | | | | | | | | We weren't solving the right problem here, this commit ends up breaking the expected state of failure. This reverts commit fba2444642f4b1b25ed4a452cfffe42d57f4050b. Ticket: OPO-755 Change-Id: I5d11bead92796ded1ad672e8e8e700703cccffa5
* | Revert "nfc: create a bootstrap service"Roman Birg2016-06-102-41/+0
| | | | | | | | | | | | | | | | | | We no longer need to start NFC before anything else, System UI will properly handle getting a proper refernce to the Nfc Adapter. This reverts commit 7bc697ba42a368c01c46c4d546e069c1f2601fd6. Change-Id: I6f3eeceba4c31b955b7a95c3b1337e1cd576c21e
* | NFC: Adding new vendor specific interface to NFC ServicePuneet Mishra2016-05-231-0/+10
| | | | | | | | | | | | | | | | A new interface was added to INfcAdapter for vendor-specific extensions and additional features. It needs to be implemented in all implementations of the interface. Change-Id: I9aa8b94cfbb04133d67c2272c82409cf7db45fec
* | Automatic translation importAbhisek Devkota2016-05-171-0/+1
| | | | | | | | Change-Id: Id12614d3f1b8fad6ae8a97d232c89c10255aa3c6
* | Nfc: Clear transfer manager service on DestroyPat Erley2016-05-171-0/+1
| | | | | | | | | | | | | | | | | | This was leading to not re-registering the intent receiver for BT transfer updates, causing NFC transfers to timeout. OPO-618 Change-Id: Ic56f6700255635995ceb17672e7b6abc454bee34
* | Revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-028-15/+15
| | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Nfc into cm-13.0" This reverts commit 29c9e9b3ac2715434567440f06e6351543be60e9, reversing changes made to 4b57e2fae047a63c4a1d41dd7238a4be629d4c15. Change-Id: Ibb74ff8656fe653bcb7f399ed4e31d5506e17f0f
* | Automatic translation importMichael Bestas2016-04-161-0/+40
| | | | | | | | Change-Id: Ide896043eb0a88904b602f611e65afc76b95c682
* | Automatic translation importMichael Bestas2016-04-061-0/+40
| | | | | | | | Change-Id: I7295be068d8c1ba555b0776e002226cf8456dcea
* | Automatic translation importMichael Bestas2016-03-282-0/+80
| | | | | | | | Change-Id: Ib5cc4ec6e610b3db594aff10234808be4da8e170
* | Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-108-15/+15
|\ \ | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Nfc into cm-13.0 Android 6.0.1 release 22
| * \ Merge branch \'klp-modular-dev\' of ↵The Android Open Source Project2015-10-200-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 am: 740e072600 am: 7390f09a40 am: 755d0a2d63 am: 8d04aeed70 am: f931ee9417 * commit 'f931ee9417b9012b7a8a8818da12051d9c77dafb':
| | * | Merge branch \'klp-modular-dev\' of ↵The Android Open Source Project2015-10-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e83149922a am: 19108b5825 am: 63280fe6e9 am: f96895a212 am: 740e072600 am: 7390f09a40 am: 755d0a2d63 am: 8d04aeed70 * commit '8d04aeed70e2b58b1e039875f7f3ef3594e0620f':
| * | | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f ↵The Android Open Source Project2015-10-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c am: 7aeb11db61 am: 1c27289895 am: 21ee8b28d1 am: 0bc4de4d32 am: 6fc59e8a80 * commit '6fc59e8a80b9a973f6831bc7482fc849d1fc252f':
| | * | Reconcile with jb-mr0-release am: 29b858a5d6 am: 24810962f8 am: 37d9ace73f ↵The Android Open Source Project2015-10-200-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a7d4ead252 am: 38c77c1443 am: 80fa64f36f am: 27602cefb4 am: 921fe1ae4d am: 29c7538644 am: 5be57758c0 am: 784ae49eb5 am: 3fdb2ab38c am: 7aeb11db61 am: 1c27289895 am: 21ee8b28d1 am: 0bc4de4d32 * commit '0bc4de4d32283267d661301e7dc9e17301b88954':
| * | | | am f08a81c4: Merge "Don\'t enable reader mode when NFC is disabled." into ↵Martijn Coenen2015-10-191-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: 4aa62e3910 * commit 'f08a81c4607350683f2061f0fcf6421f01440175': Don't enable reader mode when NFC is disabled.
| | * | | Merge "Don\'t enable reader mode when NFC is disabled." into mnc-dr-devMartijn Coenen2015-10-191-0/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4aa62e3910 * commit '4aa62e3910cf5c3138fff937d5198946c01eccfc': Don't enable reader mode when NFC is disabled.
| * | | | | am a590e214: am e208aeb6: Use global all-cpp-files-underDan Willemsen2015-10-141-12/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a590e214ebd1a2aea17ff0758ec080e36348b2c0': Use global all-cpp-files-under
| | * | | | am e208aeb6: Use global all-cpp-files-underDan Willemsen2015-10-141-12/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e208aeb621783e51b8464232ee515bca2fa0135f': Use global all-cpp-files-under
| * | | | | | am faea766f: (-s ours) am 30931b14: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'faea766f4cff1dcd3ded4d3294bf6289787eac00': Import translations. DO NOT MERGE
| | * | | | | am 30931b14: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30931b1422ee081e7e7dd934415a29a4ffbce74f': Import translations. DO NOT MERGE
| * | | | | | | am 405f1723: am 8415fed4: Grant WiFi override permission to NFC process.Martijn Coenen2015-09-231-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '405f17239f00e30674a84b16bf4d8f3d36ad5896': Grant WiFi override permission to NFC process.
| | * | | | | | am 8415fed4: Grant WiFi override permission to NFC process.Martijn Coenen2015-09-231-0/+1
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8415fed4f7544099cb42d48157df6a63594c0007': Grant WiFi override permission to NFC process.
| * | | | | | | | am 899ca873: (-s ours) am aa7adaeb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '899ca873c16f31632eca2c56b5368b20279b484a': Import translations. DO NOT MERGE
| | * | | | | | | am aa7adaeb: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa7adaeb42f3c19e3ba6b8a82fed138dcbaab133': Import translations. DO NOT MERGE
| * | | | | | | | | am 8c9730a8: am 8605731e: Support Mifare Classic tag.Jizhou Liao2015-08-3128-44/+15050
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c9730a81c73870882b4eb33aba95455b51131fb': Support Mifare Classic tag.
| | * | | | | | | | am 8605731e: Support Mifare Classic tag.Jizhou Liao2015-08-3128-44/+15050
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8605731e8f17d1fde003084811f13f52539eb20c': Support Mifare Classic tag.
| * | | | | | | | | | am ac4db9ce: am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC ↵Martijn Coenen2015-08-241-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | off. * commit 'ac4db9ce8aa24e99737782b57f924f7ddb9bb45f': Fix crash when invoking Beam with NFC off.
| | * | | | | | | | | am 9f289d60: am 14687fef: Fix crash when invoking Beam with NFC off.Martijn Coenen2015-08-241-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9f289d60c3e8de8a01ec8efc409735eadba784ad': Fix crash when invoking Beam with NFC off.
| * | | | | | | | | | | am e66316f6: am c5eec3c6: Fix peer-to-peer server register error if RF ↵Jizhou Liao2015-08-242-0/+29
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discovery is started. * commit 'e66316f6bdcd8932019a08019aa7283bb6a89f29': Fix peer-to-peer server register error if RF discovery is started.
| | * | | | | | | | | | am c5eec3c6: Fix peer-to-peer server register error if RF discovery is started.Jizhou Liao2015-08-242-0/+29
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c5eec3c659d60a469259340608d7403c73fd6865': Fix peer-to-peer server register error if RF discovery is started.
| * | | | | | | | | | | | am c132ac72: am fbbf1131: Support Mifare DESFire tag formatJizhou Liao2015-08-243-5/+94
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c132ac7230054cabf02634c0db44fcb43d3d77a0': Support Mifare DESFire tag format
| | * | | | | | | | | | | am fbbf1131: Support Mifare DESFire tag formatJizhou Liao2015-08-243-5/+94
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbbf11310bf4899be18fa3779e86d70a9ccc0764': Support Mifare DESFire tag format
| * | | | | | | | | | | | | am 3e88d804: am 26e1bc78: Fix conflict vendor proprietary definitions.Jizhou Liao2015-08-032-240/+215
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3e88d804d7601fe55332b124ce5efc4ed67d1572': Fix conflict vendor proprietary definitions.
| | * | | | | | | | | | | | am 26e1bc78: Fix conflict vendor proprietary definitions.Jizhou Liao2015-08-032-240/+215
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '26e1bc78a82d8a629a955d875c56a45ac625797a': Fix conflict vendor proprietary definitions.
| * | | | | | | | | | | | | | am 3ddd88c5: am b896d429: am 79458517: Fix NFC onManualBeamInvoke issue with ↵Alex Chau2015-07-291-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | policy * commit '3ddd88c5fe51b59b8f31ec3679767398979a74c3': Fix NFC onManualBeamInvoke issue with policy
| | * | | | | | | | | | | | | am b896d429: am 79458517: Fix NFC onManualBeamInvoke issue with policyAlex Chau2015-07-291-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b896d429c103fd6db243b9aeb4b52ec4ae9b3cdd': Fix NFC onManualBeamInvoke issue with policy
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 21:02:16 +0000