resolved conflicts for merge of d64d711d to honeycomb-merge

Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885

api/current.xml

@@ -118348,6 +118348,21 @@
  visibility="public"
 >
 </method>
+<method name="getTechnology"
+ return="android.nfc.technology.TagTechnology"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+<parameter name="tech" type="int">
+</parameter>
+</method>
 <method name="isEnabled"
  return="boolean"
  abstract="false"
@@ -118495,21 +118510,6 @@
  visibility="public"
 >
 </method>
-<method name="getTechnology"
- return="android.nfc.technology.TagTechnology"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="adapter" type="android.nfc.NfcAdapter">
-</parameter>
-<parameter name="tech" type="int">
-</parameter>
-</method>
 <method name="getTechnologyList"
  return="int[]"
  abstract="false"

core/java/android/nfc/NfcAdapter.java

@@ -22,6 +22,7 @@ import android.app.ActivityThread;
 import android.content.Context;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
+import android.nfc.technology.TagTechnology;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -370,6 +371,16 @@ public final class NfcAdapter {
         }
     }
 
+    /**
+     * 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/Tag.java

@@ -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}).
+ * (with {@link NfcAdapter#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
@@ -84,7 +84,7 @@ public class Tag implements Parcelable {
     /**
      * Construct a mock Tag.
      * <p>This is an application constructed tag, so NfcAdapter methods on this
-     * Tag such as {@link #getTechnology} may fail with
+     * Tag such as {@link NfcAdapter#getTechnology} 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
@@ -127,10 +127,7 @@ public class Tag implements Parcelable {
         return Arrays.copyOf(mTechList, mTechList.length);
     }
 
-    /**
-     * Returns the technology, or null if not present
-     */
-    public TagTechnology getTechnology(NfcAdapter adapter, int tech) {
+    /*package*/ TagTechnology getTechnology(NfcAdapter adapter, int tech) {
         int pos = -1;
         for (int idx = 0; idx < mTechList.length; idx++) {
           if (mTechList[idx] == tech) {

core/java/android/nfc/technology/IsoDep.java

@@ -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}.
+ * <p>You can acquire this kind of connection with {@link NfcAdapter#getTechnology}.
  * Use this class to send and receive data with {@link #transceive transceive()}.
  *
  * <p>Applications must implement their own protocol stack on top of

core/java/android/nfc/technology/MifareClassic.java

@@ -74,7 +74,7 @@ public final class MifareClassic extends BasicTagTechnology {
         super(adapter, tag, TagTechnology.MIFARE_CLASSIC);
 
         // Check if this could actually be a Mifare
-        NfcA a = (NfcA) tag.getTechnology(adapter, TagTechnology.NFC_A);
+        NfcA a = (NfcA) adapter.getTechnology(tag, TagTechnology.NFC_A);
         //short[] ATQA = getATQA(tag);
 
         mIsEmulated = false;

core/java/android/nfc/technology/MifareUltralight.java

@@ -47,7 +47,7 @@ public final class MifareUltralight extends BasicTagTechnology {
         super(adapter, tag, TagTechnology.MIFARE_ULTRALIGHT);
 
         // Check if this could actually be a Mifare
-        NfcA a = (NfcA) tag.getTechnology(adapter, TagTechnology.NFC_A);
+        NfcA a = (NfcA) adapter.getTechnology(tag, TagTechnology.NFC_A);
 
         mType = TYPE_UNKNOWN;
 

core/java/android/nfc/technology/Ndef.java

@@ -31,7 +31,7 @@ import java.io.IOException;
  * to interact with NDEF data. MiFare Classic cards that present NDEF data may also be used
  * via this class. To determine the exact technology being used call {@link #getTechnologyId()}
  *
- * <p>You can acquire this kind of connection with {@link Tag#getTechnology}.
+ * <p>You can acquire this kind of connection with {@link NfcAdapter#getTechnology}.
  *
  * <p class="note"><strong>Note:</strong>
  * Use of this class requires the {@link android.Manifest.permission#NFC}

core/java/android/nfc/technology/NdefFormatable.java

@@ -29,7 +29,7 @@ import java.io.IOException;
 /**
  * An interface to a {@link Tag} allowing to format the tag as NDEF.
  *
- * <p>You can acquire this kind of interface with {@link Tag#getTechnology}.
+ * <p>You can acquire this kind of interface with {@link NfcAdapter#getTechnology}.
  *
  * <p class="note"><strong>Note:</strong>
  * Use of this class requires the {@link android.Manifest.permission#NFC}

core/java/android/nfc/technology/NfcA.java

@@ -25,7 +25,7 @@ import android.os.RemoteException;
  * A low-level connection to a {@link Tag} using the NFC-A technology, also known as
  * ISO1443-3A.
  *
- * <p>You can acquire this kind of connection with {@link Tag#getTechnology}.
+ * <p>You can acquire this kind of connection with {@link NfcAdapter#getTechnology}.
  * Use this class to send and receive data with {@link #transceive transceive()}.
  *
  * <p>Applications must implement their own protocol stack on top of

core/java/android/nfc/technology/NfcB.java

@@ -25,7 +25,7 @@ import android.os.RemoteException;
  * A low-level connection to a {@link Tag} using the NFC-B technology, also known as
  * ISO1443-3B.
  *
- * <p>You can acquire this kind of connection with {@link Tag#getTechnology}.
+ * <p>You can acquire this kind of connection with {@link NfcAdapter#getTechnology}.
  * Use this class to send and receive data with {@link #transceive transceive()}.
  *
  * <p>Applications must implement their own protocol stack on top of

core/java/android/nfc/technology/NfcF.java

@@ -25,7 +25,7 @@ import android.os.RemoteException;
  * A low-level connection to a {@link Tag} using the NFC-F technology, also known as
  * JIS6319-4.
  *
- * <p>You can acquire this kind of connection with {@link Tag#getTechnology}.
+ * <p>You can acquire this kind of connection with {@link NfcAdapter#getTechnology}.
  * Use this class to send and receive data with {@link #transceive transceive()}.
  *
  * <p>Applications must implement their own protocol stack on top of

core/java/android/nfc/technology/NfcV.java

@@ -25,7 +25,7 @@ import android.os.RemoteException;
  * A low-level connection to a {@link Tag} using the NFC-V technology, also known as
  * ISO15693.
  *
- * <p>You can acquire this kind of connection with {@link Tag#getTechnology}.
+ * <p>You can acquire this kind of connection with {@link NfcAdapter#getTechnology}.
  * Use this class to send and receive data with {@link #transceive transceive()}.
  *
  * <p>Applications must implement their own protocol stack on top of