summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0Martijn Coenen2011-10-311-1/+4
| |\
| | * Fix disableForegroundNdefPush crash.Martijn Coenen2011-10-311-1/+4
* | | API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS.Nick Pelly2011-10-311-11/+25
|/ /
* | am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing."...Martijn Coenen2011-10-141-0/+1
|\ \ | |/
| * Remove NfcFragment from activity when no longer sharing.Martijn Coenen2011-10-141-0/+1
* | 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-272-11/+25
|/
* Merge "Fix Activity ref-leak in NFC dispatch API."Martijn Coenen2011-09-022-3/+21
|\
| * Fix Activity ref-leak in NFC dispatch API.Martijn Coenen2011-09-012-3/+21
* | NFC API updates.Nick Pelly2011-08-307-51/+69
|/
* Merge "Improve NDEF push API"Nick Pelly2011-08-267-211/+609
|\
| * Improve NDEF push APINick Pelly2011-08-267-211/+609
* | Add getMaxTransceiveLength() API.Martijn Coenen2011-08-2611-37/+122
|/
* Add NFC to airplane modeNick Pelly2011-08-092-24/+80
* Add Android app RTD type and convenience method.Martijn Coenen2011-08-051-0/+40
* Remove the binder interface for LLCP.Jeff Hamilton2011-08-027-161/+0
* Hide new interface to fix build.Martijn Coenen2011-07-211-0/+1
* Interfaces for enabling/disabling zero-click.Martijn Coenen2011-07-212-0/+45
* Merge "Support for getTimeout() (API)."Martijn Coenen2011-07-216-0/+91
|\
| * Support for getTimeout() (API).Martijn Coenen2011-07-206-0/+91
* | Remove the hidden My Tag APIs.Jeff Hamilton2011-07-202-44/+0
|/
* unhide public apisBen Dodson2011-07-131-4/+0
* Improve Tag.toString().Jeff Hamilton2011-06-301-7/+9
* Add a string based createUri().Jeff Hamilton2011-06-301-1/+9
* resolved conflicts for merge of 6ce70394 to masterNick Pelly2011-06-221-1/+1
|\
| * am 6f1a8edc: am 17523abb: NFC Adapter Extras API update.Nick Pelly2011-06-201-3/+1
| |\
| | * NFC Adapter Extras API update.Nick Pelly2011-06-171-3/+1
* | | Parser for uri recordsBen Dodson2011-06-171-0/+22
* | | Support for setting the NfcA transceive timeout (API).Martijn Coenen2011-06-136-4/+99
* | | NFC: Submit the missing pieces of previous commit to fix build.Nick Pelly2011-06-102-4/+0
* | | Added support for rediscovering a Tag (API).Martijn Coenen2011-06-082-0/+48