API changes for NFC.

Bug: 3366009
Change-Id: Ia28e03e1501421906b640b78d4c9a59a20e9c668

1 files changed, 129 insertions, 137 deletions

diff --git a/api/current.xml b/api/current.xml
index e5e8421..71ebbb5 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -100871,21 +100871,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="tag" type="android.nfc.Tag">
-</parameter>
-<parameter name="tech" type="int">
-</parameter>
-</method>
 <method name="isEnabled"
  return="boolean"
  abstract="false"
@@ -101098,7 +101083,7 @@
 </constructor>
 </class>
 </package>
-<package name="android.nfc.technology"
+<package name="android.nfc.tech"
 >
 <class name="BasicTagTechnology"
  extends="java.lang.Object"
@@ -101108,7 +101093,7 @@
  deprecated="not deprecated"
  visibility=""
 >
-<implements name="android.nfc.technology.TagTechnology">
+<implements name="android.nfc.tech.TagTechnology">
 </implements>
 <method name="close"
  return="void"
@@ -101182,13 +101167,26 @@
 </method>
 </class>
 <class name="IsoDep"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="get"
+ return="android.nfc.tech.IsoDep"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getHiLayerResponse"
  return="byte[]"
  abstract="false"
@@ -101241,7 +101239,7 @@
 </method>
 </class>
 <class name="MifareClassic"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
@@ -101301,6 +101299,19 @@
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
+<method name="get"
+ return="android.nfc.tech.MifareClassic"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getBlockCount"
  return="int"
  abstract="false"
@@ -101644,13 +101655,26 @@
 </field>
 </class>
 <class name="MifareUltralight"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="get"
+ return="android.nfc.tech.MifareUltralight"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getType"
  return="int"
  abstract="false"
@@ -101744,7 +101768,7 @@
 </field>
 </class>
 <class name="Ndef"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
@@ -101762,6 +101786,19 @@
  visibility="public"
 >
 </method>
+<method name="get"
+ return="android.nfc.tech.Ndef"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getCachedNdefMessage"
  return="android.nfc.NdefMessage"
  abstract="false"
@@ -101855,7 +101892,7 @@
  type="int"
  transient="false"
  volatile="false"
- value="105"
+ value="101"
  static="true"
  final="true"
  deprecated="not deprecated"
@@ -101919,7 +101956,7 @@
 </field>
 </class>
 <class name="NdefFormatable"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
@@ -101943,15 +101980,41 @@
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
+<method name="get"
+ return="android.nfc.tech.NdefFormatable"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 </class>
 <class name="NfcA"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="get"
+ return="android.nfc.tech.NfcA"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getAtqa"
  return="byte[]"
  abstract="false"
@@ -101991,13 +102054,26 @@
 </method>
 </class>
 <class name="NfcB"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="get"
+ return="android.nfc.tech.NfcB"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getApplicationData"
  return="byte[]"
  abstract="false"
@@ -102037,13 +102113,26 @@
 </method>
 </class>
 <class name="NfcF"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="get"
+ return="android.nfc.tech.NfcF"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getManufacturer"
  return="byte[]"
  abstract="false"
@@ -102083,13 +102172,26 @@
 </method>
 </class>
 <class name="NfcV"
- extends="android.nfc.technology.BasicTagTechnology"
+ extends="android.nfc.tech.BasicTagTechnology"
  abstract="false"
  static="false"
  final="true"
  deprecated="not deprecated"
  visibility="public"
 >
+<method name="get"
+ return="android.nfc.tech.NfcV"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="tag" type="android.nfc.Tag">
+</parameter>
+</method>
 <method name="getDsfId"
  return="byte"
  abstract="false"
@@ -102170,17 +102272,6 @@
  visibility="public"
 >
 </method>
-<method name="getTechnologyId"
- return="int"
- abstract="true"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-</method>
 <method name="reconnect"
  return="void"
  abstract="true"
@@ -102194,105 +102285,6 @@
 <exception name="IOException" type="java.io.IOException">
 </exception>
 </method>
-<field name="ISO_DEP"
- type="int"
- transient="false"
- volatile="false"
- value="3"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="MIFARE_CLASSIC"
- type="int"
- transient="false"
- volatile="false"
- value="8"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="MIFARE_ULTRALIGHT"
- type="int"
- transient="false"
- volatile="false"
- value="9"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="NDEF"
- type="int"
- transient="false"
- volatile="false"
- value="6"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="NDEF_FORMATABLE"
- type="int"
- transient="false"
- volatile="false"
- value="7"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="NFC_A"
- type="int"
- transient="false"
- volatile="false"
- value="1"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="NFC_B"
- type="int"
- transient="false"
- volatile="false"
- value="2"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="NFC_F"
- type="int"
- transient="false"
- volatile="false"
- value="4"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
-<field name="NFC_V"
- type="int"
- transient="false"
- volatile="false"
- value="5"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 </interface>
 </package>
 <package name="android.opengl"