Jeff Hamilton 93ec68e6a9 resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp ...

Change-Id: Ia7071ca07d917bd79e7697f4b0c0640ebb5f6a6f

2011-01-14 00:38:31 -06:00

..

technology

am 261fa998: am 25be5365: Implement canMakeReadonly().

2011-01-12 15:31:07 -08:00

ErrorCodes.java

Add a way to get a string for an error code.

2010-10-26 14:09:48 -05:00

FormatException.java

Hide some NFC API's.

2010-10-28 14:54:52 -07:00

ILlcpConnectionlessSocket.aidl

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

ILlcpServiceSocket.aidl

Remove timeout support.

2010-11-02 16:13:52 -05:00

ILlcpSocket.aidl

Remove timeout support.

2010-11-02 16:13:52 -05:00

INfcAdapter.aidl

Add dispatching overrides for foreground apps.

2011-01-13 14:24:07 -06:00

INfcSecureElement.aidl

Secure Element access implementation

2010-11-19 22:23:45 -06:00

INfcTag.aidl

Implement multi-tech connect, enfore tech exclusivity.

2010-12-15 16:41:38 -06:00

IP2pInitiator.aidl

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

IP2pTarget.aidl

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

LlcpPacket.aidl

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

LlcpPacket.java

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

NdefMessage.aidl

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

NdefMessage.java

Return a zero length byte from toByteArray instead of null.

2010-11-02 20:03:52 -05:00

NdefRecord.aidl

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

NdefRecord.java

Hide some NFC API's.

2010-10-28 14:54:52 -07:00

NfcAdapter.java

resolved conflicts for merge of 06bb3aef to honeycomb-plus-aosp

2011-01-14 00:38:31 -06:00

NfcManager.java

Make getSystemService(NFC_SERVICE) the NFC entry point.

2010-12-10 17:12:33 -08:00

NfcSecureElement.java

Secure Element access implementation

2010-11-19 22:23:45 -06:00

package.html

Make getSystemService(NFC_SERVICE) the NFC entry point.

2010-12-10 17:12:33 -08:00

Tag.aidl

NFC API revision round 2.

2010-10-12 18:37:26 -07:00

Tag.java

Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)

2011-01-10 17:28:03 +11:00