Merge "Make the new NFC APIs public." into gingerbread (0aea1836) · Commits · e / os / android_frameworks_base

api/current.xml

+1433 −0

File changed.

Preview size limit exceeded, changes collapsed.

+0 −3

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ public final class NfcAdapter {
		*
		* If any activities respond to this intent neither
		* {@link #ACTION_TECHNOLOGY_DISCOVERED} or {@link #ACTION_TAG_DISCOVERED} will be started.
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED";
		@@ -57,7 +56,6 @@ public final class NfcAdapter {
		* {@link #ACTION_TAG_DISCOVERED}
		*
		* If any activities respond to this intent {@link #ACTION_TAG_DISCOVERED} will not be started.
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_TECHNOLOGY_DISCOVERED = "android.nfc.action.TECH_DISCOVERED";
		@@ -76,7 +74,6 @@ public final class NfcAdapter {

		/**
		* Mandatory Tag extra for the ACTION_TAG intents.
		* @hide
		*/
		public static final String EXTRA_TAG = "android.nfc.extra.TAG";

+10 −5

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ import java.util.Arrays;
		* in {@link NfcAdapter#ACTION_TAG_DISCOVERED} intents. A {@link Tag} object is immutable
		* and represents the state of the tag at the time of discovery. It can be
		* directly queried for its UID and Type, or used to create a {@link TagTechnology}
		* (with {@link Tag#getTechnology(int)}).
		* (with {@link Tag#getTechnology}).
		* <p>
		* A {@link Tag} can be used to create a {@link TagTechnology} only while the tag is in
		* range. If it is removed and then returned to range, then the most recent
		@@ -55,7 +55,6 @@ import java.util.Arrays;
		* time and calls on this class will retrieve those read-only properties, and
		* not cause any further RF activity or block. Note however that arrays passed to and
		* returned by this class are not cloned, so be careful not to modify them.
		* @hide
		*/
		public class Tag implements Parcelable {
		/package/ final byte[] mId;
		@@ -249,7 +248,9 @@ public class Tag implements Parcelable {
		}
		};

		/*
		/**
		* For internal use only.
		*
		* @hide
		*/
		public synchronized void setConnectedTechnology(int technology) {
		@@ -260,14 +261,18 @@ public class Tag implements Parcelable {
		}
		}

		/*
		/**
		* For internal use only.
		*
		* @hide
		*/
		public int getConnectedTechnology() {
		return mConnectedTechnology;
		}

		/*
		/**
		* For internal use only.
		*
		* @hide
		*/
		public void setTechnologyDisconnected() {

+1 −1

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import java.io.IOException;
		* A low-level connection to a {@link Tag} using the ISO-DEP technology, also known as
		* ISO1443-4.
		*
		* <p>You can acquire this kind of connection with {@link Tag#getTechnology(int)}.
		* <p>You can acquire this kind of connection with {@link Tag#getTechnology}.
		* Use this class to send and receive data with {@link #transceive transceive()}.
		*
		* <p>Applications must implement their own protocol stack on top of

+5 −5

Original line number	Diff line number	Diff line
		@@ -26,13 +26,13 @@ import java.io.IOException;
		/**
		* Concrete class for TagTechnology.MIFARE_CLASSIC
		*
		* Mifare classic has n sectors, with varying sizes, although
		* they are at least the same pattern for any one mifare classic
		* MIFARE Classic has n sectors, with varying sizes, although
		* they are at least the same pattern for any one MIFARE Classic
		* product. Each sector has two keys. Authentication with the correct
		* key is needed before access to any sector.
		*
		* Each sector has k blocks.
		* Block size is constant across the whole mifare classic family.
		* Block size is constant across the whole MIFARE classic family.
		*/
		public final class MifareClassic extends BasicTagTechnology {
		/**
		@@ -43,12 +43,12 @@ public final class MifareClassic extends BasicTagTechnology {
		public static final byte[] KEY_DEFAULT =
		{(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF};
		/**
		* The well-known, default Mifare Application Directory read key.
		* The well-known, default MIFARE Application Directory read key.
		*/
		public static final byte[] KEY_MIFARE_APPLICATION_DIRECTORY =
		{(byte)0xA0,(byte)0xA1,(byte)0xA2,(byte)0xA3,(byte)0xA4,(byte)0xA5};
		/**
		* The well-known, default read key for NDEF data on a Mifare Classic
		* The well-known, default read key for NDEF data on a MIFARE Classic
		*/
		public static final byte[] KEY_NFC_FORUM =
		{(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7,(byte)0xD3,(byte)0xF7};