summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc/NfcAdapter.java
Commit message (Expand)AuthorAgeFilesLines
* Add new IPC for direct Beam invoke.Martijn Coenen2014-07-011-0/+16
* Make unlock api take String instead of int codesAndres Morales2014-06-201-2/+5
* Framework changes to support NFC trustlet.Andres Morales2014-06-201-0/+27
* Revert "Adding INfcUnlockSettings and NfcUnlock interface class."Andres Morales2014-05-201-24/+0
* Fix NFC docs breakage.Martijn Coenen2014-02-251-2/+2
* Add an API to manually invoke Android Beam.Martijn Coenen2014-02-141-0/+39
* Adding INfcUnlockSettings and NfcUnlock interface class.Andres Morales2013-12-091-0/+24
* additional javadoc for NfcAdapter.ReaderCallbackScott Main2013-10-171-2/+8
* Rename FLAG_READER_NFC_KOVIO to FLAG_READER_NFC_BARCODE.Martijn Coenen2013-09-121-2/+2
* Reader mode NFC API: move to callback model.Martijn Coenen2013-09-021-12/+37
* Add NFC reader-mode API.Martijn Coenen2013-08-271-0/+82
* NFC: Host-based card emulation APIs.Martijn Coenen2013-08-021-0/+24
* Add direct NDEF push API.Martijn Coenen2013-03-261-7/+31
* Make NfcAdapter states public and fix build.Martijn Coenen2013-01-091-4/+0
* Make NfcAdapter STATE_CHANGED intent action public.Martijn Coenen2013-01-091-4/+2
* docs: clean up javadoc code snippets, unescaped entitiesScott Main2012-06-251-42/+31
* Small NFC API docs addition.Martijn Coenen2012-06-061-0/+6
* NFC API documentation.Martijn Coenen2012-05-161-5/+132
* Added NFC disable during phone shutdownSunil Jogi2012-04-201-1/+2
* Unhide new Beam push APIs.Martijn Coenen2012-04-121-5/+38
* First cut at Bluetooth BeamNick Pelly2012-04-041-0/+13
* Document "disable default Beam" meta-data entry.Martijn Coenen2012-04-041-2/+24
* Use Application#registerLifecycleEvents() instead of a Fragment for Beam.Nick Pelly2012-03-291-56/+185
* Hidden API for setting p2p NFC modes.Martijn Coenen2012-03-011-0/+11
* Add NdefMessage.getByteLength(), and more minor fixes:Nick Pelly2012-01-261-2/+2
* Improve NDEF API'sNick Pelly2012-01-251-5/+31
* am 201469f5: am bb7f590a: Merge "docs: Add developer guide cross-references, ...Joe Fernandez2011-12-221-0/+6
|\
| * docs: Add developer guide cross-references, Project ACRE, round 4Joe Fernandez2011-12-221-0/+6
* | Rewrite NDEF parsing in Java, clean-up API.Nick Pelly2011-12-191-0/+5
* | Merge "Throw a nicer error message when using an invalid context to create Nfc"Nick Pelly2011-11-211-2/+5
|\ \
| * | Throw a nicer error message when using an invalid context to create NfcNick Pelly2011-11-211-2/+5
* | | 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-111-24/+54
|\ \ | |/
| * Changes for access control.Jeff Hamilton2011-11-111-24/+54
| * Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT M...Martijn Coenen2011-11-101-0/+55
* | API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS.Nick Pelly2011-10-311-11/+25
|/
* Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's."Nick Pelly2011-10-111-55/+0
|\
| * Remove deprecated (and hidden) enableForegroundNdefPush callback API's.Nick Pelly2011-09-231-55/+0
* | docs: mix of BT and NFC javadoc updatesScott Main2011-09-271-9/+23
|/
* NFC API updates.Nick Pelly2011-08-301-12/+34
* Improve NDEF push APINick Pelly2011-08-261-195/+254
* Add NFC to airplane modeNick Pelly2011-08-091-22/+78
* Hide new interface to fix build.Martijn Coenen2011-07-211-0/+1
* Interfaces for enabling/disabling zero-click.Martijn Coenen2011-07-211-0/+42
* Remove the hidden My Tag APIs.Jeff Hamilton2011-07-201-42/+0
* Add public API to do NDEF push.Jason parks2011-05-241-1/+70
* Implement new NFC-EE API's as shared library (frameworks/base).Nick Pelly2011-03-101-62/+3
* New API added in NfcAdapter to enable/disable SE card emulationdaniel_tomas2011-02-161-0/+24
* Merge "More documentation updates for NFC." into gingerbreadJeff Hamilton2011-02-091-15/+79
|\