summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* frameworks/base: Support for third party NFC featuresPuneet Mishra2016-05-234-6/+29
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-111-30/+34
|\
| * Clear calling identify b4 Beam callback.Martijn Coenen2015-12-211-30/+34
* | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-053-0/+48
|\ \ | |/
| * Fix missing copyright headers.Martijn Coenen2015-09-073-0/+48
* | NFC: Allow extensions to ApduServiceInfoPuneet Mishra2015-10-061-10/+10
|/
* Merge "In NfcActivityManager, don't use UserHandle.CURRENT." into mnc-devNicolas Prevot2015-07-021-1/+1
|\
| * In NfcActivityManager, don't use UserHandle.CURRENT.Nicolas Prevot2015-07-011-1/+1
* | am e51d6d05: am fae35eed: Merge "docs: Changed link in Java source code comme...Robert Schaub2015-07-011-1/+1
|\ \ | |/ |/|
| * am fae35eed: Merge "docs: Changed link in Java source code comment to repair ...Robert Schaub2015-06-301-1/+1
| |\
| | * docs: Changed link in Java source code comment to repair 404Robert Schaub2015-06-301-1/+1
* | | Merge "Make peer LLCP version an int." into mnc-devMartijn Coenen2015-06-101-4/+9
|\ \ \
| * | | Make peer LLCP version an int.Martijn Coenen2015-06-101-4/+9
* | | | Remove NFC CardEmulation dynamic resource APIs.Martijn Coenen2015-06-052-48/+2
|/ / /
* | | Add NFC APIs for dynamic resources.Martijn Coenen2015-04-222-2/+77
|/ /
* | Merge "Expose peer LLCP version in NDEF callbacks."Martijn Coenen2015-04-173-11/+17
|\ \ | |/ |/|
| * Expose peer LLCP version in NDEF callbacks.Martijn Coenen2015-04-153-11/+17
* | Add getPrefixAids().Martijn Coenen2015-04-151-1/+14
|/
* am 3d6cfe0e: am 873b291b: Merge "fix issuse 65774"Narayan Kamath2015-01-021-1/+1
|\
| * fix issuse 65774Paul Quei2015-01-021-1/+1
* | Merge "Verify NFC permission immediately on API calls." into lmp-mr1-devMartijn Coenen2014-11-202-0/+30
|\ \
| * | Verify NFC permission immediately on API calls.Martijn Coenen2014-11-142-0/+30
| |/
* | Add UserHandle to BeamShareDataAndres Morales2014-11-032-5/+17
|/
* Fix build, previous commit failed to remove an importAndres Morales2014-10-071-1/+0
* Remove dead NFC unlock code from fw/baseAndres Morales2014-10-061-12/+0
* Merge "Add hidden API to disable NFC (optional persist)." into lmp-devMartijn Coenen2014-09-261-0/+14
|\
| * Add hidden API to disable NFC (optional persist).Martijn Coenen2014-09-251-0/+14
* | Upper-case incoming AIDs.Martijn Coenen2014-09-162-9/+8
|/
* Merge "Fix static AID prefix registration." into lmp-devMartijn Coenen2014-09-161-1/+1
|\
| * Fix static AID prefix registration.Martijn Coenen2014-09-161-1/+1
* | Merge "AID prefix registration." into lmp-devMartijn Coenen2014-09-164-3/+31
|\ \ | |/
| * AID prefix registration.Martijn Coenen2014-09-084-3/+31
* | Add hidden API for pausing and resuming NFC polling.Andres Morales2014-09-112-0/+29
|/
* Remove old NFC unlock apiAndres Morales2014-08-192-31/+0
* Fix issue where unlock handlers are not properly updatedAndres Morales2014-08-152-16/+25
* NFC Unlock api changesAndres Morales2014-07-314-3/+103
* Revert "NFC Unlock api changes"Andres Morales2014-07-304-103/+3
* NFC Unlock api changesAndres Morales2014-07-304-3/+103
* Make some NFC APIs @systemAPI.Martijn Coenen2014-07-301-1/+7
* Add API to query for AID prefix support.Martijn Coenen2014-07-021-0/+15
* Clean up dynamic AID XML parser.Martijn Coenen2014-07-021-11/+28
* Move AID validation to CardEmulation.Martijn Coenen2014-07-023-36/+39
* Add new IPC for direct Beam invoke.Martijn Coenen2014-07-012-1/+19
* Validate AIDs when registered.Martijn Coenen2014-07-012-7/+29
* Make unlock api take String instead of int codesAndres Morales2014-06-202-2/+41
* Framework changes to support NFC trustlet.Andres Morales2014-06-203-0/+42
* Address HCE API review comments.Martijn Coenen2014-05-292-32/+36
* Revert "Adding INfcUnlockSettings and NfcUnlock interface class."Andres Morales2014-05-204-351/+0
* HCE/SE foreground support.Martijn Coenen2014-05-064-12/+152
* Dynamic AID registration APIs for HCE.Martijn Coenen2014-04-235-108/+420
generated by cgit v1.1 at 2024-05-29 20:57:54 +0000