summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* 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
* am 4d328a79: am a43f7cb0: am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessag...Martijn Coenen2014-03-061-0/+2
|\
| * NFC: getNdefMessage() should throw exception if no tag in field.Mathias Jeppsson2014-01-281-0/+2
* | Merge "Tabs -> spaces in frameworks/base."John Spurlock2014-02-251-1/+1
|\ \
| * | Tabs -> spaces in frameworks/base.John Spurlock2014-02-251-1/+1
* | | Fix NFC docs breakage.Martijn Coenen2014-02-251-2/+2
* | | Add an API to manually invoke Android Beam.Martijn Coenen2014-02-144-1/+90
|/ /
* | Adding accessor for integer tech codes to TagAndres Morales2013-12-161-0/+8
* | Adding INfcUnlockSettings and NfcUnlock interface class.Andres Morales2013-12-094-0/+351
* | Remove unused imports from frameworks/base.John Spurlock2013-11-202-2/+0
* | Add "urn:nfc" shortener.Martijn Coenen2013-11-141-0/+1
|/
* additional javadoc for NfcAdapter.ReaderCallbackScott Main2013-10-171-2/+8
* NFC card emulation API docs.Martijn Coenen2013-10-144-97/+296
* Fix crash in ApduServiceInfo parsing.Martijn Coenen2013-09-261-1/+1
* Merge "Validate AID format and length." into klp-devMartijn Coenen2013-09-181-0/+9
|\
| * Validate AID format and length.Martijn Coenen2013-09-181-0/+9
* | Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.Martijn Coenen2013-09-121-2/+2
|/
* Add support for loading banners from HCE services.Martijn Coenen2013-09-111-2/+34
* Remove legacy HCE APIs.Martijn Coenen2013-09-043-401/+3