summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* 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
* Add NfcBarcode technology API.Martijn Coenen2012-09-253-2/+113
* Fix NPE in NdefRecord parser.Martijn Coenen2012-09-061-1/+2
* Fix several cases of broken droiddoc syntaxJeff Smith2012-07-251-1/+1
* docs: clean up javadoc code snippets, unescaped entitiesScott Main2012-06-251-42/+31
* docs: fix several linksScott Main2012-06-221-1/+1
* Small NFC API docs addition.Martijn Coenen2012-06-061-0/+6
* NFC API documentation.Martijn Coenen2012-05-162-6/+149
* Rename Uri.normalize() to Uri.normalizeScheme().Jesse Wilson2012-05-101-6/+6
* Added NFC disable during phone shutdownSunil Jogi2012-04-202-2/+3
* Unhide new Beam push APIs.Martijn Coenen2012-04-123-27/+76
* Merge "Make sure initial activity state is correct."Martijn Coenen2012-04-051-0/+4
|\
| * Make sure initial activity state is correct.Martijn Coenen2012-04-051-0/+4
* | Merge "Patch to support MIFARE with SAK 0x01"Martijn Coenen2012-04-051-0/+1
|\ \ | |/ |/|
| * Patch to support MIFARE with SAK 0x01Sunil Jogi2012-04-021-0/+1
* | First cut at Bluetooth BeamNick Pelly2012-04-043-1/+55
* | Merge "Add API for querying extended length APDU support."Martijn Coenen2012-04-042-0/+24
|\ \
| * | Add API for querying extended length APDU support.Martijn Coenen2012-04-042-0/+24
| |/
* | Document "disable default Beam" meta-data entry.Martijn Coenen2012-04-041-2/+24
|/
* Merge "Fix permission documentation."Martijn Coenen2012-03-302-1/+2
|\
| * Fix permission documentation.Martijn Coenen2012-03-292-1/+2
* | Merge "Fix NDEF documentation to indicate the message may be null."Martijn Coenen2012-03-292-15/+11
|\ \ | |/
| * Fix NDEF documentation to indicate the message may be null.Martijn Coenen2012-03-292-15/+11
* | Merge "Allow formatting a tag as NDEF without a message."Martijn Coenen2012-03-291-3/+7
|\ \ | |/
| * Allow formatting a tag as NDEF without a message.Martijn Coenen2012-03-291-3/+7
* | Use Application#registerLifecycleEvents() instead of a Fragment for Beam.Nick Pelly2012-03-294-280/+406
|/
* Hidden API for setting p2p NFC modes.Martijn Coenen2012-03-012-0/+13