Nick Pelly b8a8c7a279 resolved conflicts for merge of 6ce70394 to master ...

Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf

2011-06-22 20:32:36 -07:00

..

tech

Support for setting the NfcA transceive timeout (API).

2011-06-13 18:22:57 +02:00

ApduList.aidl

Implement teardown script.

2011-04-01 14:41:18 -05:00

ApduList.java

Implement teardown script.

2011-04-01 14:41:18 -05:00

ErrorCodes.java

Connecting to a NFC technology may fail.

2011-06-06 12:43:05 +02:00

FormatException.java

Hide some NFC API's.

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

ILlcpConnectionlessSocket.aidl

…

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

INdefPushCallback.aidl

Add public API to do NDEF push.

2011-05-24 15:22:07 -05:00

INfcAdapter.aidl

NFC: Submit the missing pieces of previous commit to fix build.

2011-06-10 15:22:28 -07:00

INfcAdapterExtras.aidl

NFC Adapter Extras API update.

2011-06-17 14:51:40 -07:00

INfcTag.aidl

Support for setting the NfcA transceive timeout (API).

2011-06-13 18:22:57 +02:00

IP2pInitiator.aidl

…

IP2pTarget.aidl

…

LlcpPacket.aidl

…

LlcpPacket.java

…

NdefMessage.aidl

…

NdefMessage.java

Return a zero length byte from toByteArray instead of null.

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

NdefRecord.aidl

…

NdefRecord.java

Parser for uri records

2011-06-17 15:37:32 -07:00

NfcAdapter.java

Add public API to do NDEF push.

2011-05-24 15:22:07 -05:00

NfcManager.java

Make getSystemService(NFC_SERVICE) the NFC entry point.

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

package.html

Make getSystemService(NFC_SERVICE) the NFC entry point.

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

Tag.aidl

…

Tag.java

Added support for rediscovering a Tag (API).

2011-06-08 23:26:42 +02:00

TagLostException.java

Support for TagLostException (API).

2011-01-18 18:32:50 -08:00

TechListParcel.aidl

Use classnames instead of ints for NFC techs.

2011-01-25 16:32:26 -06:00

TechListParcel.java

Use classnames instead of ints for NFC techs.

2011-01-25 16:32:26 -06:00

TransceiveResult.aidl

Support for TagLostException (API).

2011-01-18 18:32:50 -08:00

TransceiveResult.java

Support for TagLostException (API).

2011-01-18 18:32:50 -08:00