am 0716ea14: Merge "Javadoc updates for NFC." into gingerbread

* commit '0716ea144d94b9dfce4670e90a849db19a492da9':
  Javadoc updates for NFC.

1 files changed, 82 insertions, 201 deletions

diff --git a/api/current.xml b/api/current.xml
index ad39a5f..6afec8c 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -102822,7 +102822,7 @@
 <parameter name="activity" type="android.app.Activity">
 </parameter>
 </method>
-<method name="disableNdefPushDispatch"
+<method name="disableForegroundNdefPush"
  return="void"
  abstract="false"
  native="false"
@@ -103103,17 +103103,6 @@
 >
 <implements name="android.nfc.technology.TagTechnology">
 </implements>
-<method name="checkConnected"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="close"
  return="void"
  abstract="false"
@@ -103184,21 +103173,6 @@
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="transceive"
- return="byte[]"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="data" type="byte[]">
-</parameter>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-</method>
 </class>
 <class name="IsoDep"
  extends="android.nfc.technology.BasicTagTechnology"
@@ -103208,23 +103182,18 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="IsoDep"
- type="android.nfc.technology.IsoDep"
+<method name="getHiLayerResponse"
+ return="byte[]"
+ 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="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</constructor>
-<method name="getHiLayerResponse"
+</method>
+<method name="getHistoricalBytes"
  return="byte[]"
  abstract="false"
  native="false"
@@ -103235,7 +103204,7 @@
  visibility="public"
 >
 </method>
-<method name="getHistoricalBytes"
+<method name="transceive"
  return="byte[]"
  abstract="false"
  native="false"
@@ -103245,6 +103214,10 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="data" type="byte[]">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
 </class>
 <class name="MifareClassic"
@@ -103255,22 +103228,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="MifareClassic"
- type="android.nfc.technology.MifareClassic"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="adapter" type="android.nfc.NfcAdapter">
-</parameter>
-<parameter name="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</constructor>
 <method name="authenticateBlock"
  return="boolean"
  abstract="false"
@@ -103463,6 +103420,21 @@
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
+<method name="transceive"
+ return="byte[]"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="data" type="byte[]">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
+</method>
 <method name="transfer"
  return="void"
  abstract="false"
@@ -103613,17 +103585,6 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_DESFIRE"
- type="int"
- transient="false"
- volatile="false"
- value="3"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="TYPE_PLUS"
  type="int"
  transient="false"
@@ -103646,17 +103607,6 @@
  visibility="public"
 >
 </field>
-<field name="TYPE_ULTRALIGHT"
- type="int"
- transient="false"
- volatile="false"
- value="4"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="TYPE_UNKNOWN"
  type="int"
  transient="false"
@@ -103677,22 +103627,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="MifareUltralight"
- type="android.nfc.technology.MifareUltralight"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="adapter" type="android.nfc.NfcAdapter">
-</parameter>
-<parameter name="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</constructor>
 <method name="getType"
  return="int"
  abstract="false"
@@ -103714,12 +103648,12 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="page" type="int">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="readOTP"
+<method name="transceive"
  return="byte[]"
  abstract="false"
  native="false"
@@ -103729,21 +103663,6 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<exception name="IOException" type="java.io.IOException">
-</exception>
-</method>
-<method name="writeBlock"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="block" type="int">
-</parameter>
 <parameter name="data" type="byte[]">
 </parameter>
 <exception name="IOException" type="java.io.IOException">
@@ -103759,7 +103678,7 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<parameter name="block" type="int">
+<parameter name="page" type="int">
 </parameter>
 <parameter name="data" type="byte[]">
 </parameter>
@@ -103830,21 +103749,6 @@
  visibility="public"
 >
 </method>
-<method name="getExtraNdefMessage"
- return="android.nfc.NdefMessage[]"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<exception name="FormatException" type="android.nfc.FormatException">
-</exception>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-</method>
 <method name="getMaxSize"
  return="int"
  abstract="false"
@@ -103906,25 +103810,6 @@
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<method name="writeExtraNdefMessage"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="i" type="int">
-</parameter>
-<parameter name="msg" type="android.nfc.NdefMessage">
-</parameter>
-<exception name="FormatException" type="android.nfc.FormatException">
-</exception>
-<exception name="IOException" type="java.io.IOException">
-</exception>
-</method>
 <method name="writeNdefMessage"
  return="void"
  abstract="false"
@@ -104043,24 +103928,19 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="NfcA"
- type="android.nfc.technology.NfcA"
+<method name="getAtqa"
+ return="byte[]"
+ 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="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</constructor>
-<method name="getAtqa"
- return="byte[]"
+</method>
+<method name="getSak"
+ return="short"
  abstract="false"
  native="false"
  synchronized="false"
@@ -104070,8 +103950,8 @@
  visibility="public"
 >
 </method>
-<method name="getSak"
- return="short"
+<method name="transceive"
+ return="byte[]"
  abstract="false"
  native="false"
  synchronized="false"
@@ -104080,6 +103960,10 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="data" type="byte[]">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
 </class>
 <class name="NfcB"
@@ -104090,23 +103974,18 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="NfcB"
- type="android.nfc.technology.NfcB"
+<method name="getApplicationData"
+ return="byte[]"
+ 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="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</constructor>
-<method name="getApplicationData"
+</method>
+<method name="getProtocolInfo"
  return="byte[]"
  abstract="false"
  native="false"
@@ -104117,7 +103996,7 @@
  visibility="public"
 >
 </method>
-<method name="getProtocolInfo"
+<method name="transceive"
  return="byte[]"
  abstract="false"
  native="false"
@@ -104127,6 +104006,10 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="data" type="byte[]">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
 </class>
 <class name="NfcF"
@@ -104137,23 +104020,18 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="NfcF"
- type="android.nfc.technology.NfcF"
+<method name="getManufacturer"
+ return="byte[]"
+ 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="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</constructor>
-<method name="getManufacturer"
+</method>
+<method name="getSystemCode"
  return="byte[]"
  abstract="false"
  native="false"
@@ -104164,7 +104042,7 @@
  visibility="public"
 >
 </method>
-<method name="getSystemCode"
+<method name="transceive"
  return="byte[]"
  abstract="false"
  native="false"
@@ -104174,6 +104052,10 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="data" type="byte[]">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
 </class>
 <class name="NfcV"
@@ -104184,23 +104066,18 @@
  deprecated="not deprecated"
  visibility="public"
 >
-<constructor name="NfcV"
- type="android.nfc.technology.NfcV"
+<method name="getDsfId"
+ return="byte"
+ 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="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="extras" type="android.os.Bundle">
-</parameter>
-<exception name="RemoteException" type="android.os.RemoteException">
-</exception>
-</constructor>
-<method name="getDsfId"
+</method>
+<method name="getResponseFlags"
  return="byte"
  abstract="false"
  native="false"
@@ -104211,8 +104088,8 @@
  visibility="public"
 >
 </method>
-<method name="getResponseFlags"
- return="byte"
+<method name="transceive"
+ return="byte[]"
  abstract="false"
  native="false"
  synchronized="false"
@@ -104221,6 +104098,10 @@
  deprecated="not deprecated"
  visibility="public"
 >
+<parameter name="data" type="byte[]">
+</parameter>
+<exception name="IOException" type="java.io.IOException">
+</exception>
 </method>
 </class>
 <interface name="TagTechnology"