summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge "Reader mode NFC API: move to callback model." into klp-devMartijn Coenen2013-09-044-26/+81
|\
| * Reader mode NFC API: move to callback model.Martijn Coenen2013-09-024-26/+81
* | Add drawable for Apdu Services, fix build.Martijn Coenen2013-09-031-2/+2
* | NFC: @hide and remove abstract from processCommandApdu().Martijn Coenen2013-09-031-2/+5
* | HCE API review.Martijn Coenen2013-08-305-8/+378
|/
* Add an API for querying HCE service selection mode.Martijn Coenen2013-08-293-12/+111
* Add NFC reader-mode API.Martijn Coenen2013-08-273-1/+143
* NFC: Allow HostApduService to indicate transaction unhandled.Martijn Coenen2013-08-191-0/+83
* NFC: always upper-case parsed AIDs.Martijn Coenen2013-08-091-1/+2
* NFC: Unify ApduServiceInfo for on/off host.Martijn Coenen2013-08-072-19/+45
* Merge "NFC: @hide some APIs, add setDefaultForNextTap API."Martijn Coenen2013-08-062-2/+24
|\
| * NFC: @hide some APIs, add setDefaultForNextTap API.Martijn Coenen2013-08-062-2/+24
* | am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should ...Elliott Hughes2013-08-021-2/+2
|\ \ | |/ |/|
| * If frameworks wants ASCII casing, it should explicity ask for it.Elliott Hughes2013-08-021-2/+2
* | NFC: Host-based card emulation APIs.Martijn Coenen2013-08-028-3/+677
* | Change XML-grammar for (Off)HostApduServices.Martijn Coenen2013-07-253-112/+68
* | First shot at (host-based) card emulation APIs.Martijn Coenen2013-07-222-0/+333
|/
* resolved conflicts for merge of fca0f92e to stage-aosp-masterElliott Hughes2013-06-281-10/+10
|\
| * Switch frameworks/base over from @hidden Charsets to public StandardCharsets.Elliott Hughes2013-06-281-10/+10
* | Add direct NDEF push API.Martijn Coenen2013-03-265-39/+135
* | Update NfcBarcode documentation for Kovio.Martijn Coenen2013-03-072-0/+23
* | Merge "Make NfcAdapter states public and fix build."Martijn Coenen2013-01-091-4/+0
|\ \
| * | Make NfcAdapter states public and fix build.Martijn Coenen2013-01-091-4/+0
* | | Merge "Make NfcAdapter STATE_CHANGED intent action public."Martijn Coenen2013-01-091-4/+2
|\ \ \ | |/ /
| * | Make NfcAdapter STATE_CHANGED intent action public.Martijn Coenen2013-01-091-4/+2
| |/
* | Don't IPC for every onPause() in NfcActivityManager.Martijn Coenen2013-01-071-10/+8
|/
* NfcAdapterExtras: expose driver name.mike wakerly2012-10-031-0/+1
* Fix build.Martijn Coenen2012-09-252-1/+5