Merge "Fix API review comments, add remove callback." into nyc-dev (d19191d4) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,7 @@ LOCAL_SRC_FILES += \
		core/java/android/nfc/INfcCardEmulation.aidl \
		core/java/android/nfc/INfcFCardEmulation.aidl \
		core/java/android/nfc/INfcUnlockHandler.aidl \
		core/java/android/nfc/ITagRemovedCallback.aidl \
		core/java/android/os/IBatteryPropertiesListener.aidl \
		core/java/android/os/IBatteryPropertiesRegistrar.aidl \
		core/java/android/os/ICancellationSignal.aidl \

+5 −1

Original line number	Diff line number	Diff line
		@@ -25011,6 +25011,7 @@ package android.nfc {
		method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);
		method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
		method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
		method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);
		method public boolean invokeBeam(android.app.Activity);
		method public boolean isEnabled();
		method public boolean isNdefPushEnabled();
		@@ -25053,6 +25054,10 @@ package android.nfc {
		method public abstract void onNdefPushComplete(android.nfc.NfcEvent);
		}

		public static abstract interface NfcAdapter.OnTagRemovedListener {
		method public abstract void onTagRemoved();
		}

		public static abstract interface NfcAdapter.ReaderCallback {
		method public abstract void onTagDiscovered(android.nfc.Tag);
		}
		@@ -25069,7 +25074,6 @@ package android.nfc {

		public final class Tag implements android.os.Parcelable {
		method public int describeContents();
		method public boolean done(int);
		method public byte[] getId();
		method public java.lang.String[] getTechList();
		method public void writeToParcel(android.os.Parcel, int);

+5 −1

Original line number	Diff line number	Diff line
		@@ -27447,6 +27447,7 @@ package android.nfc {
		method public boolean enableNdefPush();
		method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
		method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
		method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);
		method public boolean invokeBeam(android.app.Activity);
		method public boolean isEnabled();
		method public boolean isNdefPushEnabled();
		@@ -27496,6 +27497,10 @@ package android.nfc {
		method public abstract void onNdefPushComplete(android.nfc.NfcEvent);
		}

		public static abstract interface NfcAdapter.OnTagRemovedListener {
		method public abstract void onTagRemoved();
		}

		public static abstract interface NfcAdapter.ReaderCallback {
		method public abstract void onTagDiscovered(android.nfc.Tag);
		}
		@@ -27512,7 +27517,6 @@ package android.nfc {

		public final class Tag implements android.os.Parcelable {
		method public int describeContents();
		method public boolean done(int);
		method public byte[] getId();
		method public java.lang.String[] getTechList();
		method public void writeToParcel(android.os.Parcel, int);

+5 −1

Original line number	Diff line number	Diff line
		@@ -25079,6 +25079,7 @@ package android.nfc {
		method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);
		method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
		method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
		method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);
		method public boolean invokeBeam(android.app.Activity);
		method public boolean isEnabled();
		method public boolean isNdefPushEnabled();
		@@ -25121,6 +25122,10 @@ package android.nfc {
		method public abstract void onNdefPushComplete(android.nfc.NfcEvent);
		}

		public static abstract interface NfcAdapter.OnTagRemovedListener {
		method public abstract void onTagRemoved();
		}

		public static abstract interface NfcAdapter.ReaderCallback {
		method public abstract void onTagDiscovered(android.nfc.Tag);
		}
		@@ -25137,7 +25142,6 @@ package android.nfc {

		public final class Tag implements android.os.Parcelable {
		method public int describeContents();
		method public boolean done(int);
		method public byte[] getId();
		method public java.lang.String[] getTechList();
		method public void writeToParcel(android.os.Parcel, int);

+3 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.nfc.INfcTag;
		import android.nfc.INfcCardEmulation;
		import android.nfc.INfcFCardEmulation;
		import android.nfc.INfcUnlockHandler;
		import android.nfc.ITagRemovedCallback;
		import android.os.Bundle;

		/**
		@@ -55,6 +56,8 @@ interface INfcAdapter
		oneway void invokeBeam();
		oneway void invokeBeamInternal(in BeamShareData shareData);

		boolean ignore(int nativeHandle, int debounceMs, ITagRemovedCallback callback);

		void dispatch(in Tag tag);

		void setReaderMode (IBinder b, IAppCallback callback, int flags, in Bundle extras);