Merge "Remove the My Tag feature." into gingerbread (ef569469) · Commits · e / os / android_frameworks_base

core/java/android/nfc/INfcAdapter.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,6 @@ interface INfcAdapter

		// NfcAdapter-class related methods
		boolean isEnabled();
		NdefMessage localGet();
		void localSet(in NdefMessage message);
		void openTagConnection(in Tag tag);

		// Non-public methods

+0 −42

Original line number	Diff line number	Diff line
		@@ -300,48 +300,6 @@ public final class NfcAdapter {
		}
		}

		/**
		* Set the NDEF Message that this NFC adapter should appear as to Tag
		* readers.
		* <p>
		* Any Tag reader can read the contents of the local tag when it is in
		* proximity, without any further user confirmation.
		* <p>
		* The implementation of this method must either
		* <ul>
		* <li>act as a passive tag containing this NDEF message
		* <li>provide the NDEF message on over LLCP to peer NFC adapters
		* </ul>
		* The NDEF message is preserved across reboot.
		* <p>Requires {@link android.Manifest.permission#NFC} permission.
		*
		* @param message NDEF message to make public
		* @hide
		*/
		public void setLocalNdefMessage(NdefMessage message) {
		try {
		mService.localSet(message);
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		}
		}

		/**
		* Get the NDEF Message that this adapter appears as to Tag readers.
		* <p>Requires {@link android.Manifest.permission#NFC} permission.
		*
		* @return NDEF Message that is publicly readable
		* @hide
		*/
		public NdefMessage getLocalNdefMessage() {
		try {
		return mService.localGet();
		} catch (RemoteException e) {
		attemptDeadServiceRecovery(e);
		return null;
		}
		}

		/**
		* Create a raw tag connection to the default Target
		* <p>Requires {@link android.Manifest.permission#NFC} permission.