Merge "API changes for NFC." into gingerbread

Author: jham

api/current.xml

@@ -26,7 +26,7 @@
 import android.content.IntentFilter;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
-import android.nfc.technology.TagTechnology;
+import android.nfc.tech.TagTechnology;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -531,16 +531,6 @@ void disableForegroundNdefPushInternal(Activity activity, boolean force) {
         }
     }
 
-    /**
-     * Retrieve a TagTechnology object used to interact with a Tag that is
-     * in field.
-     * <p>
-     * @return TagTechnology object, or null if not present
-     */
-    public TagTechnology getTechnology(Tag tag, int tech) {
-        return tag.getTechnology(NfcAdapter.this, tech);
-    }
-
     /**
      * Set the NDEF Message that this NFC adapter should appear as to Tag
      * readers.

core/java/android/nfc/NfcAdapter.java

@@ -16,7 +16,7 @@
 
 package android.nfc;
 
-import android.nfc.technology.TagTechnology;
+import android.nfc.tech.TagTechnology;
 import android.os.RemoteException;
 import android.util.Log;
 

core/java/android/nfc/NfcSecureElement.java

@@ -16,20 +16,10 @@
 
 package android.nfc;
 
-import android.nfc.technology.IsoDep;
-import android.nfc.technology.MifareClassic;
-import android.nfc.technology.MifareUltralight;
-import android.nfc.technology.NfcV;
-import android.nfc.technology.Ndef;
-import android.nfc.technology.NdefFormatable;
-import android.nfc.technology.NfcA;
-import android.nfc.technology.NfcB;
-import android.nfc.technology.NfcF;
-import android.nfc.technology.TagTechnology;
+import android.nfc.tech.TagTechnology;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.os.RemoteException;
 
 import java.util.Arrays;
 
@@ -44,8 +34,8 @@
  * {@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}
- * (with {@link NfcAdapter#getTechnology}).
+ * 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.
  * <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
@@ -61,14 +51,16 @@ public class Tag implements Parcelable {
     /*package*/ final int[] mTechList;
     /*package*/ final Bundle[] mTechExtras;
     /*package*/ final int mServiceHandle;  // for use by NFC service, 0 indicates a mock
+    /*package*/ final INfcTag mTagService;
 
     /*package*/ int mConnectedTechnology;
 
     /**
      * Hidden constructor to be used by NFC service and internal classes.
      * @hide
      */
-    public Tag(byte[] id, int[] techList, Bundle[] techListExtras, int serviceHandle) {
+    public Tag(byte[] id, int[] techList, Bundle[] techListExtras, int serviceHandle,
+            INfcTag tagService) {
         if (techList == null) {
             throw new IllegalArgumentException("rawTargets cannot be null");
         }
@@ -77,23 +69,23 @@ public Tag(byte[] id, int[] techList, Bundle[] techListExtras, int serviceHandle
         // Ensure mTechExtras is as long as mTechList
         mTechExtras = Arrays.copyOf(techListExtras, techList.length);
         mServiceHandle = serviceHandle;
+        mTagService = tagService;
 
         mConnectedTechnology = -1;
     }
 
     /**
      * Construct a mock Tag.
-     * <p>This is an application constructed tag, so NfcAdapter methods on this
-     * Tag such as {@link NfcAdapter#getTechnology} may fail with
-     * {@link IllegalArgumentException} since it does not represent a physical Tag.
+     * <p>This is an application constructed tag, so NfcAdapter methods on this Tag may fail
+     * with {@link IllegalArgumentException} since it does not represent a physical Tag.
      * <p>This constructor might be useful for mock testing.
      * @param id The tag identifier, can be null
      * @param techList must not be null
      * @return freshly constructed tag
      */
     public static Tag createMockTag(byte[] id, int[] techList, Bundle[] techListExtras) {
         // set serviceHandle to 0 to indicate mock tag
-        return new Tag(id, techList, techListExtras, 0);
+        return new Tag(id, techList, techListExtras, 0, null);
     }
 
     /**
@@ -127,7 +119,16 @@ public int[] getTechnologyList() {
         return Arrays.copyOf(mTechList, mTechList.length);
     }
 
-    /*package*/ TagTechnology getTechnology(NfcAdapter adapter, int tech) {
+    /** @hide */
+    public boolean hasTech(int techType) {
+        for (int tech : mTechList) {
+            if (tech == techType) return true;
+        }
+        return false;
+    }
+    
+    /** @hide */
+    public Bundle getTechExtras(int tech) {
         int pos = -1;
         for (int idx = 0; idx < mTechList.length; idx++) {
           if (mTechList[idx] == tech) {
@@ -139,44 +140,12 @@ public int[] getTechnologyList() {
             return null;
         }
 
-        Bundle extras = mTechExtras[pos];
-        try {
-            switch (tech) {
-                case TagTechnology.NFC_A: {
-                    return new NfcA(adapter, this, extras);
-                }
-                case TagTechnology.NFC_B: {
-                    return new NfcB(adapter, this, extras);
-                }
-                case TagTechnology.ISO_DEP: {
-                    return new IsoDep(adapter, this, extras);
-                }
-                case TagTechnology.NFC_V: {
-                    return new NfcV(adapter, this, extras);
-                }
-                case TagTechnology.NDEF: {
-                    return new Ndef(adapter, this, tech, extras);
-                }
-                case TagTechnology.NDEF_FORMATABLE: {
-                    return new NdefFormatable(adapter, this, tech, extras);
-                }
-                case TagTechnology.NFC_F: {
-                    return new NfcF(adapter, this, extras);
-                }
-                case TagTechnology.MIFARE_CLASSIC: {
-                    return new MifareClassic(adapter, this, extras);
-                }
-                case TagTechnology.MIFARE_ULTRALIGHT: {
-                    return new MifareUltralight(adapter, this, extras);
-                }
+        return mTechExtras[pos];
+    }
 
-                default: {
-                    throw new UnsupportedOperationException("Tech " + tech + " not supported");
-                }
-            }
-        } catch (RemoteException e) {
-            return null;
-        }
+    /** @hide */
+    public INfcTag getTagService() {
+        return mTagService;
     }
 
     @Override
@@ -223,6 +192,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeIntArray(mTechList);
         dest.writeTypedArray(mTechExtras, 0);
         dest.writeInt(mServiceHandle);
+        dest.writeStrongBinder(mTagService.asBinder());
     }
 
     public static final Parcelable.Creator<Tag> CREATOR =
@@ -235,8 +205,9 @@ public Tag createFromParcel(Parcel in) {
             in.readIntArray(techList);
             Bundle[] techExtras = in.createTypedArray(Bundle.CREATOR);
             int serviceHandle = in.readInt();
+            INfcTag tagService = INfcTag.Stub.asInterface(in.readStrongBinder());
 
-            return new Tag(id, techList, techExtras, serviceHandle);
+            return new Tag(id, techList, techExtras, serviceHandle, tagService);
         }
 
         @Override

core/java/android/nfc/Tag.java

@@ -14,20 +14,17 @@
  * limitations under the License.
  */
 
-package android.nfc.technology;
+package android.nfc.tech;
 
-import java.io.IOException;
-
-import android.nfc.INfcAdapter;
-import android.nfc.INfcTag;
-import android.nfc.NfcAdapter;
-import android.nfc.TransceiveResult;
-import android.nfc.Tag;
 import android.nfc.ErrorCodes;
+import android.nfc.Tag;
 import android.nfc.TagLostException;
+import android.nfc.TransceiveResult;
 import android.os.RemoteException;
 import android.util.Log;
 
+import java.io.IOException;
+
 /**
  * A base class for tag technologies that are built on top of transceive().
  */
@@ -37,11 +34,8 @@
     /*package*/ final Tag mTag;
     /*package*/ boolean mIsConnected;
     /*package*/ int mSelectedTechnology;
-    private final NfcAdapter mAdapter;
-    /*package*/ final INfcAdapter mService;
-    /*package*/ final INfcTag mTagService;
 
-    BasicTagTechnology(NfcAdapter adapter, Tag tag, int tech) throws RemoteException {
+    BasicTagTechnology(Tag tag, int tech) throws RemoteException {
         int[] techList = tag.getTechnologyList();
         int i;
 
@@ -56,15 +50,12 @@
             throw new IllegalArgumentException("Technology " + tech + " not present on tag " + tag);
         }
 
-        mAdapter = adapter;
-        mService = mAdapter.getService();
-        mTagService = mAdapter.getTagService();
         mTag = tag;
         mSelectedTechnology = tech;
     }
 
-    BasicTagTechnology(NfcAdapter adapter, Tag tag) throws RemoteException {
-        this(adapter, tag, tag.getTechnologyList()[0]);
+    BasicTagTechnology(Tag tag) throws RemoteException {
+        this(tag, tag.getTechnologyList()[0]);
     }
 
     @Override
@@ -100,7 +91,7 @@ public boolean isConnected() {
         }
 
         try {
-            return mTagService.isPresent(mTag.getServiceHandle());
+            return mTag.getTagService().isPresent(mTag.getServiceHandle());
         } catch (RemoteException e) {
             Log.e(TAG, "NFC service dead", e);
             return false;
@@ -110,7 +101,7 @@ public boolean isConnected() {
     @Override
     public void connect() throws IOException {
         try {
-            int errorCode = mTagService.connect(mTag.getServiceHandle(), getTechnologyId());
+            int errorCode = mTag.getTagService().connect(mTag.getServiceHandle(), getTechnologyId());
 
             if (errorCode == ErrorCodes.SUCCESS) {
                 // Store this in the tag object
@@ -132,7 +123,7 @@ public void reconnect() throws IOException {
         }
 
         try {
-            int errorCode = mTagService.reconnect(mTag.getServiceHandle());
+            int errorCode = mTag.getTagService().reconnect(mTag.getServiceHandle());
 
             if (errorCode != ErrorCodes.SUCCESS) {
                 mIsConnected = false;
@@ -153,7 +144,7 @@ public void close() {
             /* Note that we don't want to physically disconnect the tag,
              * but just reconnect to it to reset its state
              */
-            mTagService.reconnect(mTag.getServiceHandle());
+            mTag.getTagService().reconnect(mTag.getServiceHandle());
         } catch (RemoteException e) {
             Log.e(TAG, "NFC service dead", e);
         } finally {
@@ -167,7 +158,7 @@ public void close() {
         checkConnected();
 
         try {
-            TransceiveResult result = mTagService.transceive(mTag.getServiceHandle(), data, raw);
+            TransceiveResult result = mTag.getTagService().transceive(mTag.getServiceHandle(), data, raw);
             if (result == null) {
                 throw new IOException("transceive failed");
             } else {

…d/nfc/technology/BasicTagTechnology.java …android/nfc/tech/BasicTagTechnology.javacore/java/android/nfc/technology/BasicTagTechnology.java renamed to core/java/android/nfc/tech/BasicTagTechnology.java core/java/android/nfc/technology/BasicTagTechnology.java renamed to core/java/android/nfc/tech/BasicTagTechnology.java

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package android.nfc.technology;
+package android.nfc.tech;
 
-import android.nfc.NfcAdapter;
 import android.nfc.Tag;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -28,7 +27,7 @@
  * 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 NfcAdapter#getTechnology}.
+ * <p>You can acquire this kind of connection with {@link #get}.
  * Use this class to send and receive data with {@link #transceive transceive()}.
  *
  * <p>Applications must implement their own protocol stack on top of
@@ -49,10 +48,26 @@ public final class IsoDep extends BasicTagTechnology {
     private byte[] mHiLayerResponse = null;
     private byte[] mHistBytes = null;
 
+    /**
+     * Returns an instance of this tech for the given tag. If the tag doesn't support
+     * this tech type null is returned.
+     *
+     * @param tag The tag to get the tech from
+     */
+    public static IsoDep get(Tag tag) {
+        if (!tag.hasTech(TagTechnology.ISO_DEP)) return null;
+        try {
+            return new IsoDep(tag);
+        } catch (RemoteException e) {
+            return null;
+        }
+    }
+    
     /** @hide */
-    public IsoDep(NfcAdapter adapter, Tag tag, Bundle extras)
+    public IsoDep(Tag tag)
             throws RemoteException {
-        super(adapter, tag, TagTechnology.ISO_DEP);
+        super(tag, TagTechnology.ISO_DEP);
+        Bundle extras = tag.getTechExtras(TagTechnology.ISO_DEP);
         if (extras != null) {
             mHiLayerResponse = extras.getByteArray(EXTRA_HI_LAYER_RESP);
             mHistBytes = extras.getByteArray(EXTRA_HIST_BYTES);
@@ -70,7 +85,7 @@ public IsoDep(NfcAdapter adapter, Tag tag, Bundle extras)
      */
     public void setTimeout(int timeout) {
         try {
-            mTagService.setIsoDepTimeout(timeout);
+            mTag.getTagService().setIsoDepTimeout(timeout);
         } catch (RemoteException e) {
             Log.e(TAG, "NFC service dead", e);
         }
@@ -79,7 +94,7 @@ public void setTimeout(int timeout) {
     @Override
     public void close() {
         try {
-            mTagService.resetIsoDepTimeout();
+            mTag.getTagService().resetIsoDepTimeout();
         } catch (RemoteException e) {
             Log.e(TAG, "NFC service dead", e);
         }