summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* 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
* Fix doc bug.Nick Pelly2012-01-271-1/+1
* Add NdefMessage.getByteLength(), and more minor fixes:Nick Pelly2012-01-265-23/+41
* Improve NDEF API'sNick Pelly2012-01-254-131/+231
* Remove LlcpPacket from public namespace.Martijn Coenen2012-01-132-107/+0
* am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, ...Joe Fernandez2011-12-223-2/+19
|\
| * docs: Add developer guide cross-references, Project ACRE, round 4Joe Fernandez2011-12-223-2/+19
* | Merge "Rewrite NDEF parsing in Java, clean-up API."Nick Pelly2011-12-194-210/+796
|\ \
| * | Rewrite NDEF parsing in Java, clean-up API.Nick Pelly2011-12-194-210/+796
* | | Fix NPE on mock NDEF tech operations.Martijn Coenen2011-12-152-2/+17
|/ /
* | Merge "Throw a nicer error message when using an invalid context to create Nfc"Nick Pelly2011-11-212-2/+9
|\ \
| * | Throw a nicer error message when using an invalid context to create NfcNick Pelly2011-11-212-2/+9
* | | am c6a0277b: am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." in...Nick Pelly2011-11-171-0/+4
|\ \ \ | |/ / |/| / | |/
| * Fix NPE on devices that don't have NFC.Nick Pelly2011-11-161-0/+4
* | am 4780228f: am 48b651cb: Merge "Changes for access control." into ics-mr1Nick Pelly2011-11-114-32/+63
|\ \ | |/
| * Changes for access control.Jeff Hamilton2011-11-114-32/+63
| * Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT M...Martijn Coenen2011-11-101-0/+55
* | am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into i...Martijn Coenen2011-11-011-1/+4
|\ \ | |/