DO NOT MERGE (a8d3f02a) · Commits · e / os / android_frameworks_base

core/java/android/nfc/NfcAdapter.java

+144 −39

Original line number	Diff line number	Diff line
		@@ -26,14 +26,17 @@ import android.content.Context;
		import android.content.IntentFilter;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.nfc.tech.MifareClassic;
		import android.nfc.tech.Ndef;
		import android.nfc.tech.NfcA;
		import android.nfc.tech.NfcF;
		import android.os.IBinder;
		import android.os.Parcel;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.util.Log;

		/**
		* Represents the device's local NFC adapter.
		* Represents the local NFC adapter.
		* <p>
		* Use the helper {@link #getDefaultAdapter(Context)} to get the default NFC
		* adapter for this Android device.
		@@ -43,30 +46,85 @@ public final class NfcAdapter {

		/**
		* Intent to start an activity when a tag with NDEF payload is discovered.
		* If the tag has and NDEF payload this intent is started before
		* {@link #ACTION_TECH_DISCOVERED}.
		*
		* If any activities respond to this intent neither
		* <p>The system inspects the first {@link NdefRecord} in the first {@link NdefMessage} and
		* looks for a URI, SmartPoster, or MIME record. If a URI or SmartPoster record is found the
		* intent will contain the URI in its data field. If a MIME record is found the intent will
		* contain the MIME type in its type field. This allows activities to register
		* {@link IntentFilter}s targeting specific content on tags. Activities should register the
		* most specific intent filters possible to avoid the activity chooser dialog, which can
		* disrupt the interaction with the tag as the user interacts with the screen.
		*
		* <p>If the tag has an NDEF payload this intent is started before
		* {@link #ACTION_TECH_DISCOVERED}. If any activities respond to this intent neither
		* {@link #ACTION_TECH_DISCOVERED} or {@link #ACTION_TAG_DISCOVERED} will be started.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED";

		/**
		* Intent to started when a tag is discovered. The data URI is formated as
		* {@code vnd.android.nfc://tag/} with the path having a directory entry for each technology
		* in the {@link Tag#getTechList()} is sorted ascending order.
		* Intent to start an activity when a tag is discovered and activities are registered for the
		* specific technologies on the tag.
		*
		* <p>To receive this intent an activity must include an intent filter
		* for this action and specify the desired tech types in a
		* manifest <code>meta-data</code> entry. Here is an example manfiest entry:
		* <pre>
		* <activity android:name=".nfc.TechFilter" android:label="NFC/TechFilter">
		* <!-- Add a technology filter -->
		* <intent-filter>
		* <action android:name="android.nfc.action.TECH_DISCOVERED" />
		* </intent-filter>
		*
		* <meta-data android:name="android.nfc.action.TECH_DISCOVERED"
		* android:resource="@xml/filter_nfc"
		* />
		* </activity>
		* </pre>
		*
		* <p>The meta-data XML file should contain one or more <code>tech-list</code> entries
		* each consisting or one or more <code>tech</code> entries. The <code>tech</code> entries refer
		* to the qualified class name implementing the technology, for example "android.nfc.tech.NfcA".
		*
		* <p>A tag matches if any of the
		* <code>tech-list</code> sets is a subset of {@link Tag#getTechList() Tag.getTechList()}. Each
		* of the <code>tech-list</code>s is considered independently and the
		* activity is considered a match is any single <code>tech-list</code> matches the tag that was
		* discovered. This provides AND and OR semantics for filtering desired techs. Here is an
		* example that will match any tag using {@link NfcF} or any tag using {@link NfcA},
		* {@link MifareClassic}, and {@link Ndef}:
		*
		* <pre>
		* <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		* <!-- capture anything using NfcF -->
		* <tech-list>
		* <tech>android.nfc.tech.NfcF</tech>
		* </tech-list>
		*
		* <!-- OR -->
		*
		* This intent is started after {@link #ACTION_NDEF_DISCOVERED} and before
		* {@link #ACTION_TAG_DISCOVERED}
		* <!-- capture all MIFARE Classics with NDEF payloads -->
		* <tech-list>
		* <tech>android.nfc.tech.NfcA</tech>
		* <tech>android.nfc.tech.MifareClassic</tech>
		* <tech>android.nfc.tech.Ndef</tech>
		* </tech-list>
		* </resources>
		* </pre>
		*
		* If any activities respond to this intent {@link #ACTION_TAG_DISCOVERED} will not be started.
		* <p>This intent is started after {@link #ACTION_NDEF_DISCOVERED} and before
		* {@link #ACTION_TAG_DISCOVERED}. If any activities respond to {@link #ACTION_NDEF_DISCOVERED}
		* this intent will not be started. If any activities respond to this intent
		* {@link #ACTION_TAG_DISCOVERED} will not be started.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_TECH_DISCOVERED = "android.nfc.action.TECH_DISCOVERED";

		/**
		* Intent to start an activity when a tag is discovered.
		*
		* <p>This intent will not be started when a tag is discovered if any activities respond to
		* {@link #ACTION_NDEF_DISCOVERED} or {@link #ACTION_TECH_DISCOVERED} for the current tag.
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_TAG_DISCOVERED = "android.nfc.action.TAG_DISCOVERED";
		@@ -78,17 +136,23 @@ public final class NfcAdapter {
		public static final String ACTION_TAG_LEFT_FIELD = "android.nfc.action.TAG_LOST";

		/**
		* Mandatory Tag extra for the ACTION_TAG intents.
		* Mandatory extra containing the {@link Tag} that was discovered for the
		* {@link #ACTION_NDEF_DISCOVERED}, {@link #ACTION_TECH_DISCOVERED}, and
		* {@link #ACTION_TAG_DISCOVERED} intents.
		*/
		public static final String EXTRA_TAG = "android.nfc.extra.TAG";

		/**
		* Optional NdefMessage[] extra for the ACTION_TAG intents.
		* Optional extra containing an array of {@link NdefMessage} present on the discovered tag for
		* the {@link #ACTION_NDEF_DISCOVERED}, {@link #ACTION_TECH_DISCOVERED}, and
		* {@link #ACTION_TAG_DISCOVERED} intents.
		*/
		public static final String EXTRA_NDEF_MESSAGES = "android.nfc.extra.NDEF_MESSAGES";

		/**
		* Optional byte[] extra for the tag identifier.
		* Optional extra containing a byte array containing the ID of the discovered tag for
		* the {@link #ACTION_NDEF_DISCOVERED}, {@link #ACTION_TECH_DISCOVERED}, and
		* {@link #ACTION_TAG_DISCOVERED} intents.
		*/
		public static final String EXTRA_ID = "android.nfc.extra.ID";

		@@ -359,14 +423,13 @@ public final class NfcAdapter {

		/**
		* Return true if this NFC Adapter has any features enabled.
		* <p>
		* If this method returns false, then applications should request the user
		* turn on NFC tag discovery in Settings.
		* <p>
		* If this method returns false, the NFC hardware is guaranteed not to
		* perform or respond to any NFC communication.
		*
		* @return true if this NFC Adapter is enabled to discover new tags
		* <p>Application may use this as a helper to suggest that the user
		* should turn on NFC in Settings.
		* <p>If this method returns false, the NFC hardware is guaranteed not to
		* generate or respond to any NFC transactions.
		*
		* @return true if this NFC Adapter has any features enabled
		*/
		public boolean isEnabled() {
		try {
		@@ -414,17 +477,37 @@ public final class NfcAdapter {
		}

		/**
		* Enables foreground dispatching to the given Activity. This will force all NFC Intents that
		* match the given filters to be delivered to the activity bypassing the standard dispatch
		* mechanism. If no IntentFilters are given all the PendingIntent will be invoked for every
		* dispatch Intent.
		* Enable foreground dispatch to the given Activity.
		*
		* <p>This will give give priority to the foreground activity when
		* dispatching a discovered {@link Tag} to an application.
		*
		* <p>If any IntentFilters are provided to this method they are used to match dispatch Intents
		* for both the {@link NfcAdapter#ACTION_NDEF_DISCOVERED} and
		* {@link NfcAdapter#ACTION_TAG_DISCOVERED}. Since {@link NfcAdapter#ACTION_TECH_DISCOVERED}
		* relies on meta data outside of the IntentFilter matching for that dispatch Intent is handled
		* by passing in the tech lists separately. Each first level entry in the tech list represents
		* an array of technologies that must all be present to match. If any of the first level sets
		* match then the dispatch is routed through the given PendingIntent. In other words, the second
		* level is ANDed together and the first level entries are ORed together.
		*
		* This method must be called from the main thread.
		* <p>If you pass {@code null} for both the {@code filters} and {@code techLists} parameters
		* that acts a wild card and will cause the foreground activity to receive all tags via the
		* {@link NfcAdapter#ACTION_TAG_DISCOVERED} intent.
		*
		* <p>This method must be called from the main thread, and only when the activity is in the
		* foreground (resumed). Also, activities must call {@link #disableForegroundDispatch} before
		* the completion of their {@link Activity#onPause} callback to disable foreground dispatch
		* after it has been enabled.
		*
		* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
		*
		* @param activity the Activity to dispatch to
		* @param intent the PendingIntent to start for the dispatch
		* @param filters the IntentFilters to override dispatching for, or null to always dispatch
		* @throws IllegalStateException
		* @param techLists the tech lists used to perform matching for dispatching of the
		* {@link NfcAdapter#ACTION_TECH_DISCOVERED} intent
		* @throws IllegalStateException if the Activity is not currently in the foreground
		*/
		public void enableForegroundDispatch(Activity activity, PendingIntent intent,
		IntentFilter[] filters, String[][] techLists) {
		@@ -450,13 +533,18 @@ public final class NfcAdapter {
		}

		/**
		* Disables foreground activity dispatching setup with
		* {@link #enableForegroundDispatch}.
		* Disable foreground dispatch to the given activity.
		*
		* <p>This must be called before the Activity returns from
		* it's <code>onPause()</code> or this method will throw an IllegalStateException.
		* <p>After calling {@link #enableForegroundDispatch}, an activity
		* must call this method before its {@link Activity#onPause} callback
		* completes.
		*
		* <p>This method must be called from the main thread.
		*
		* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
		*
		* @param activity the Activity to disable dispatch to
		* @throws IllegalStateException if the Activity has already been paused
		*/
		public void disableForegroundDispatch(Activity activity) {
		ActivityThread.currentActivityThread().unregisterOnActivityPausedListener(activity,
		@@ -484,13 +572,24 @@ public final class NfcAdapter {
		}

		/**
		* Enable NDEF message push over P2P while this Activity is in the foreground. For this to
		* function properly the other NFC device being scanned must support the "com.android.npp"
		* NDEF push protocol.
		* Enable NDEF message push over P2P while this Activity is in the foreground.
		*
		* <p>For this to function properly the other NFC device being scanned must
		* support the "com.android.npp" NDEF push protocol. Support for this
		* protocol is currently optional for Android NFC devices.
		*
		* <p><em>NOTE</em> While foreground NDEF push is active standard tag dispatch is disabled.
		* <p>This method must be called from the main thread.
		*
		* <p class="note"><em>NOTE:</em> While foreground NDEF push is active standard tag dispatch is disabled.
		* Only the foreground activity may receive tag discovered dispatches via
		* {@link #enableForegroundDispatch}.
		*
		* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
		*
		* @param activity the foreground Activity
		* @param msg a NDEF Message to push over P2P
		* @throws IllegalStateException if the Activity is not currently in the foreground
		* @throws OperationNotSupportedException if this Android device does not support NDEF push
		*/
		public void enableForegroundNdefPush(Activity activity, NdefMessage msg) {
		if (activity == null \|\| msg == null) {
		@@ -510,13 +609,19 @@ public final class NfcAdapter {
		}

		/**
		* Disables foreground NDEF push setup with
		* {@link #enableForegroundNdefPush}.
		* Disable NDEF message push over P2P.
		*
		* <p>This must be called before the Activity returns from
		* it's <code>onPause()</code> or this method will throw an IllegalStateException.
		* <p>After calling {@link #enableForegroundNdefPush}, an activity
		* must call this method before its {@link Activity#onPause} callback
		* completes.
		*
		* <p>This method must be called from the main thread.
		*
		* <p class="note">Requires the {@link android.Manifest.permission#NFC} permission.
		*
		* @param activity the Foreground activity
		* @throws IllegalStateException if the Activity has already been paused
		* @throws OperationNotSupportedException if this Android device does not support NDEF push
		*/
		public void disableForegroundNdefPush(Activity activity) {
		ActivityThread.currentActivityThread().unregisterOnActivityPausedListener(activity,

core/java/android/nfc/Tag.java

+93 −26

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.nfc;

		import android.content.Context;
		import android.nfc.tech.IsoDep;
		import android.nfc.tech.MifareClassic;
		import android.nfc.tech.MifareUltralight;
		@@ -33,27 +34,76 @@ import android.os.Parcelable;
		import java.util.Arrays;

		/**
		* Represents a (generic) discovered tag.
		* Represents an NFC tag that has been discovered.
		* <p>
		* A tag is a passive NFC element, such as NFC Forum Tag's, MIFARE class Tags,
		* Sony FeliCa Tags, etc.
		* {@link Tag} is an immutable object that represents the state of a NFC tag at
		* the time of discovery. It can be used as a handle to {@link TagTechnology} classes
		* to perform advanced operations, or directly queried for its ID via {@link #getId} and the
		* set of technologies it contains via {@link #getTechList}. Arrays passed to and
		* returned by this class are <em>not</em> cloned, so be careful not to modify them.
		* <p>
		* Tag's have a type and usually have a UID.
		* A new tag object is created every time a tag is discovered (comes into range), even
		* if it is the same physical tag. If a tag is removed and then returned into range, then
		* only the most recent tag object can be successfully used to create a {@link TagTechnology}.
		*
		* <h3>Tag Dispatch</h3>
		* When a tag is discovered, a {@link Tag} object is created and passed to a
		* single activity via the {@link NfcAdapter#EXTRA_TAG} extra in an
		* {@link android.content.Intent} via {@link Context#startActivity}. A four stage dispatch is used
		* to select the
		* most appropriate activity to handle the tag. The Android OS executes each stage in order,
		* and completes dispatch as soon as a single matching activity is found. If there are multiple
		* matching activities found at any one stage then the Android activity chooser dialog is shown
		* to allow the user to select the activity to receive the tag.
		*
		* <p>The Tag dispatch mechanism was designed to give a high probability of dispatching
		* a tag to the correct activity without showing the user an activity chooser dialog.
		* This is important for NFC interactions because they are very transient -- if a user has to
		* move the Android device to choose an application then the connection will likely be broken.
		*
		* <h4>1. Foreground activity dispatch</h4>
		* A foreground activity that has called
		* {@link NfcAdapter#enableForegroundDispatch NfcAdapter.enableForegroundDispatch()} is
		* given priority. See the documentation on
		* {@link NfcAdapter#enableForegroundDispatch NfcAdapter.enableForegroundDispatch()} for
		* its usage.
		* <h4>2. NDEF data dispatch</h4>
		* If the tag contains NDEF data the system inspects the first {@link NdefRecord} in the first
		* {@link NdefMessage}. If the record is a URI, SmartPoster, or MIME data
		* {@link Context#startActivity} is called with {@link NfcAdapter#ACTION_NDEF_DISCOVERED}. For URI
		* and SmartPoster records the URI is put into the intent's data field. For MIME records the MIME
		* type is put in the intent's type field. This allows activities to register to be launched only
		* when data they know how to handle is present on a tag. This is the preferred method of handling
		* data on a tag since NDEF data can be stored on many types of tags and doesn't depend on a
		* specific tag technology.
		* See {@link NfcAdapter#ACTION_NDEF_DISCOVERED} for more detail. If the tag does not contain
		* NDEF data, or if no activity is registered
		* for {@link NfcAdapter#ACTION_NDEF_DISCOVERED} with a matching data URI or MIME type then dispatch
		* moves to stage 3.
		* <h4>3. Tag Technology dispatch</h4>
		* {@link Context#startActivity} is called with {@link NfcAdapter#ACTION_TECH_DISCOVERED} to
		* dispatch the tag to an activity that can handle the technologies present on the tag.
		* Technologies are defined as sub-classes of {@link TagTechnology}, see the package
		* {@link android.nfc.tech}. The Android OS looks for an activity that can handle one or
		* more technologies in the tag. See {@link NfcAdapter#ACTION_TECH_DISCOVERED} for more detail.
		* <h4>4. Fall-back dispatch</h4>
		* If no activity has been matched then {@link Context#startActivity} is called with
		* {@link NfcAdapter#ACTION_TAG_DISCOVERED}. This is intended as a fall-back mechanism.
		* See {@link NfcAdapter#ACTION_TAG_DISCOVERED}.
		*
		* <h3>NFC Tag Background</h3>
		* An NFC tag is a passive NFC device, powered by the NFC field of this Android device while
		* it is in range. Tag's can come in many forms, such as stickers, cards, key fobs, or
		* even embedded in a more sophisticated device.
		* <p>
		* {@link Tag} objects are passed to applications via the {@link NfcAdapter#EXTRA_TAG} extra
		* 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} using the
		* static <code>get()</code> methods on the varios tech classes.
		* Tags can have a wide range of capabilities. Simple tags just offer read/write semantics,
		* and contain some one time
		* programmable areas to make read-only. More complex tags offer math operations
		* and per-sector access control and authentication. The most sophisticated tags
		* contain operating environments allowing complex interactions with the
		* code executing on the tag. Use {@link TagTechnology} classes to access a broad
		* range of capabilities available in NFC tags.
		* <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
		* {@link Tag} object (in {@link NfcAdapter#ACTION_TAG_DISCOVERED}) should be used to create a
		* {@link TagTechnology}.
		* <p>This is an immutable data class. All properties are set at Tag discovery
		* 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.
		*/
		public final class Tag implements Parcelable {
		/package/ final byte[] mId;
		@@ -149,21 +199,35 @@ public final class Tag implements Parcelable {

		/**
		* Get the Tag Identifier (if it has one).
		* <p>Tag ID is usually a serial number for the tag.
		*
		* @return ID, or null if it does not exist
		* <p>The tag identifier is a low level serial number, used for anti-collision
		* and identification.
		* <p> Most tags have a stable unique identifier
		* (UID), but some tags will generate a random ID every time they are discovered
		* (RID), and there are some tags with no ID at all (the byte array will be zero-sized).
		* <p> The size and format of an ID is specific to the RF technology used by the tag.
		* <p> This function retrieves the ID as determined at discovery time, and does not
		* perform any further RF communication or block.
		* @return ID as byte array, never null
		*/
		public byte[] getId() {
		return mId;
		}

		/**
		* Returns technologies present in the tag that this implementation understands,
		* or a zero length array if there are no supported technologies on this tag.
		*
		* The elements of the list are the names of the classes implementing the technology.
		*
		* Get the technologies available in this tag, as fully qualified class names.
		* <p>
		* A technology is an implementation of the {@link TagTechnology} interface,
		* and can be instantiated by calling the static <code>get(Tag)</code>
		* method on the implementation with this Tag. The {@link TagTechnology}
		* object can then be used to perform advanced, technology-specific operations on a tag.
		* <p>
		* Android defines a mandatory set of technologies that must be correctly
		* enumerated by all Android NFC devices, and an optional
		* set of proprietary technologies.
		* See {@link TagTechnology} for more details.
		* <p>
		* The ordering of the returned array is undefined and should not be relied upon.
		* @return an array of fully-qualified {@link TagTechnology} class-names.
		*/
		public String[] getTechList() {
		return mTechStringList;
		@@ -198,6 +262,9 @@ public final class Tag implements Parcelable {
		return mTagService;
		}

		/**
		* Human-readable description of the tag, for debugging.
		*/
		@Override
		public String toString() {
		StringBuilder sb = new StringBuilder("TAG ")

core/java/android/nfc/tech/IsoDep.java

+60 −31

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/nfc/tech/MifareClassic.java

+227 −63

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/nfc/tech/MifareUltralight.java

+72 −31

File changed.

Preview size limit exceeded, changes collapsed.