summaryrefslogtreecommitdiffstats
path: root/core/java/android/nfc
Commit message (Expand)AuthorAgeFilesLines
* Fix NPE on devices that don't have NFC.Nick Pelly2011-11-161-0/+4
* 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 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0Martijn Coenen2011-10-311-1/+4
|\
| * Fix disableForegroundNdefPush crash.Martijn Coenen2011-10-311-1/+4
* | 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
* | | Merge "Move NDEF URI helper method into android.nfc.NfcRecord"Nick Pelly2011-06-081-0/+91
|\ \ \
| * | | Move NDEF URI helper method into android.nfc.NfcRecordNick Pelly2011-06-081-0/+91
* | | | Implement Felica timeout handling (API).Martijn Coenen2011-06-084-11/+28
|/ / /
* | | Connecting to a NFC technology may fail.Martijn Coenen2011-06-062-1/+8
* | | am 7c324a3f: am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into h...Jeff Hamilton2011-05-312-9/+9
|\ \ \ | |/ /
| * | am 5e654d02: am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2Jeff Hamilton2011-05-252-9/+9
| |\ \ | | |/ | |/|
| | * am 14019abb: Merge "Swap Mifare for MIFARE." into honeycomb-mr2Jeff Hamilton2011-05-252-9/+9
| | |\
| | | * Swap Mifare for MIFARE.Jeff Hamilton2011-05-252-9/+9
* | | | Implement Mifare Ultralight-C detection (API).Martijn Coenen2011-05-311-4/+10
* | | | Fix NdefRecord flags handling.Martijn Coenen2011-05-271-5/+16
* | | | Add public API to do NDEF push.Jason parks2011-05-243-1/+100
|/ / /
* | | Implement teardown script.Jason parks2011-04-013-1/+92
|/ /
* | Implement new NFC-EE API's as shared library (frameworks/base).Nick Pelly2011-03-104-216/+16
|/
* Support for NDEF on iCODE.Jeff Hamilton2011-02-241-0/+9
* New API added in NfcAdapter to enable/disable SE card emulationdaniel_tomas2011-02-161-0/+24
* Adding package summary for nfc.tech packageRobert Ly2011-02-151-0/+13