Ruchi Kandoi d98f84b0d9 Merge "Deprecate Android beam APIs and create a feature flag to gate them" am: 6a3d45c4b2 am: d0c8a165d8 ...

am: a33da54c8d

Change-Id: I1eda6b7d5879045e6bd35821ee5368ef72855942

2019-01-04 14:18:15 -08:00

..

cardemulation

Merge changes from topic "multi-se-support" am: 54502d68ea

2019-01-04 12:25:13 -08:00

dta

…

tech

Merge "docs: fixed five typos" into pi-dev am: 82b413428e

2018-09-18 12:10:35 -07:00

ApduList.aidl

…

ApduList.java

…

BeamShareData.aidl

…

BeamShareData.java

…

ErrorCodes.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

FormatException.java

…

IAppCallback.aidl

…

INfcAdapter.aidl

…

INfcAdapterExtras.aidl

…

INfcCardEmulation.aidl

Add a mechanism to register AIDs to specific off-host SE

2019-01-04 01:14:50 +00:00

INfcDta.aidl

…

INfcFCardEmulation.aidl

…

INfcTag.aidl

…

INfcUnlockHandler.aidl

…

ITagRemovedCallback.aidl

…

NdefMessage.aidl

…

NdefMessage.java

Fix broken links in @see tags in framework docs.

2018-06-01 17:15:55 +00:00

NdefRecord.aidl

…

NdefRecord.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

NfcActivityManager.java

resolve merge conflicts of 92b78539e3 to stage-aosp-master

2018-08-03 11:05:23 +01:00

NfcAdapter.java

Deprecate Android beam APIs and create a feature flag to gate them

2019-01-04 21:49:00 +00:00

NfcEvent.java

…

NfcManager.java

Move some members to the "Q blacklist".

2018-10-22 17:28:24 -07:00

package.html

…

Tag.aidl

…

Tag.java

Add @UnsupportedAppUsage annotations

2018-07-31 16:08:26 +01:00

TagLostException.java

…

TechListParcel.aidl

…

TechListParcel.java

…

TransceiveResult.aidl

…

TransceiveResult.java

…