Ruchi Kandoi 4d08be4a52 Merge changes from topic 'NCI-2.0' ...

am: 430dded515

Change-Id: I264533bf8782ea66bd6959ca08f9699985273c9f

2017-07-06 22:48:20 +00:00

..

cardemulation

AID suffix registration.

2017-07-06 10:31:27 -07:00

tech

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

ApduList.aidl

…

ApduList.java

…

BeamShareData.aidl

…

BeamShareData.java

…

ErrorCodes.java

…

FormatException.java

…

IAppCallback.aidl

Make NFC AIDL callbacks oneway

2017-05-26 14:11:28 -07:00

INfcAdapter.aidl

…

INfcAdapterExtras.aidl

…

INfcCardEmulation.aidl

…

INfcFCardEmulation.aidl

…

INfcTag.aidl

…

INfcUnlockHandler.aidl

…

ITagRemovedCallback.aidl

…

NdefMessage.aidl

…

NdefMessage.java

…

NdefRecord.aidl

…

NdefRecord.java

Add ID_LENGTH field for Empty type record

2017-05-26 20:53:59 +00:00

NfcActivityManager.java

…

NfcAdapter.java

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

NfcEvent.java

…

NfcManager.java

Annotate @SystemApi with required permissions.

2017-06-05 13:27:11 -06:00

package.html

…

Tag.aidl

…

Tag.java

…

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…