Merge "Update Android Beam deprecated API description" (527b6de0) · Commits · e / os / android_frameworks_base

core/java/android/nfc/NfcAdapter.java

+20 −10

Original line number	Diff line number	Diff line
		@@ -373,7 +373,8 @@ public final class NfcAdapter {
		* A callback to be invoked when the system successfully delivers your {@link NdefMessage}
		* to another device.
		* @see #setOnNdefPushCompleteCallback
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public interface OnNdefPushCompleteCallback {
		@@ -398,7 +399,8 @@ public final class NfcAdapter {
		* content currently visible to the user. Alternatively, you can call {@link
		* #setNdefPushMessage setNdefPushMessage()} if the {@link NdefMessage} always contains the
		* same data.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public interface CreateNdefMessageCallback {
		@@ -427,7 +429,8 @@ public final class NfcAdapter {


		/**
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public interface CreateBeamUrisCallback {
		@@ -981,7 +984,8 @@ public final class NfcAdapter {
		* @param uris an array of Uri(s) to push over Android Beam
		* @param activity activity for which the Uri(s) will be pushed
		* @throws UnsupportedOperationException if FEATURE_NFC is unavailable.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public void setBeamPushUris(Uri[] uris, Activity activity) {
		@@ -1068,7 +1072,8 @@ public final class NfcAdapter {
		* @param callback callback, or null to disable
		* @param activity activity for which the Uri(s) will be pushed
		* @throws UnsupportedOperationException if FEATURE_NFC is unavailable.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public void setBeamPushUrisCallback(CreateBeamUrisCallback callback, Activity activity) {
		@@ -1157,7 +1162,8 @@ public final class NfcAdapter {
		* to only register one at a time, and to do so in that activity's
		* {@link Activity#onCreate}
		* @throws UnsupportedOperationException if FEATURE_NFC is unavailable.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public void setNdefPushMessage(NdefMessage message, Activity activity,
		@@ -1275,7 +1281,8 @@ public final class NfcAdapter {
		* to only register one at a time, and to do so in that activity's
		* {@link Activity#onCreate}
		* @throws UnsupportedOperationException if FEATURE_NFC is unavailable.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public void setNdefPushMessageCallback(CreateNdefMessageCallback callback, Activity activity,
		@@ -1361,7 +1368,8 @@ public final class NfcAdapter {
		* to only register one at a time, and to do so in that activity's
		* {@link Activity#onCreate}
		* @throws UnsupportedOperationException if FEATURE_NFC is unavailable.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public void setOnNdefPushCompleteCallback(OnNdefPushCompleteCallback callback,
		@@ -1577,7 +1585,8 @@ public final class NfcAdapter {
		* @param activity the current foreground Activity that has registered data to share
		* @return whether the Beam animation was successfully invoked
		* @throws UnsupportedOperationException if FEATURE_NFC is unavailable.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated
		public boolean invokeBeam(Activity activity) {
		@@ -1821,7 +1830,8 @@ public final class NfcAdapter {
		* @see android.provider.Settings#ACTION_NFCSHARING_SETTINGS
		* @return true if NDEF Push feature is enabled
		* @throws UnsupportedOperationException if FEATURE_NFC is unavailable.
		* @deprecated this feature is deprecated.
		* @deprecated this feature is deprecated. File sharing can work using other technology like
		* Bluetooth.
		*/
		@java.lang.Deprecated