Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 826da229 authored by Nick Pelly's avatar Nick Pelly
Browse files

Reconcile api/11.xml with honeycomb-plus-aosp to fix build. 

Change-Id: I107094cf0d2972a45e6ef9d7555096cbcd4ebe01
parent 17689de1

api/11.xml

+34 −60
Original line number Diff line number Diff line
@@ -118639,7 +118639,7 @@ 
 visibility="public"

>

</field>

<field name="ACTION_TECHNOLOGY_DISCOVERED"

<field name="ACTION_TECH_DISCOVERED"

 type="java.lang.String"

 transient="false"

 volatile="false"
@@ -118708,29 +118708,12 @@ 
 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<method name="createMockTag"

 return="android.nfc.Tag"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="id" type="byte[]">

</parameter>

<parameter name="techList" type="int[]">

</parameter>

<parameter name="techListExtras" type="android.os.Bundle[]">

</parameter>

</method>

<method name="describeContents"

 return="int"

 abstract="false"
@@ -118878,19 +118861,6 @@ 
 visibility="public"

>

</method>

<method name="reconnect"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

</class>

<class name="IsoDep"

 extends="android.nfc.tech.BasicTagTechnology"
@@ -119478,7 +119448,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="canMakeReadonly"

<method name="canMakeReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -119540,7 +119510,7 @@ 
</exception>

</method>

<method name="getType"

 return="int"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"
@@ -119561,7 +119531,7 @@ 
 visibility="public"

>

</method>

<method name="makeReadonly"

<method name="makeReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -119592,10 +119562,10 @@ 
</exception>

</method>

<field name="MIFARE_CLASSIC"

 type="int"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="101"

 value="&quot;com.nxp.ndef.mifareclassic&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -119603,10 +119573,10 @@ 
>

</field>

<field name="NFC_FORUM_TYPE_1"

 type="int"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="1"

 value="&quot;org.nfcforum.ndef.type1&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -119614,10 +119584,10 @@ 
>

</field>

<field name="NFC_FORUM_TYPE_2"

 type="int"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="2"

 value="&quot;org.nfcforum.ndef.type2&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -119625,10 +119595,10 @@ 
>

</field>

<field name="NFC_FORUM_TYPE_3"

 type="int"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="3"

 value="&quot;org.nfcforum.ndef.type3&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -119636,21 +119606,10 @@ 
>

</field>

<field name="NFC_FORUM_TYPE_4"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="OTHER"

 type="int"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="-1"

 value="&quot;org.nfcforum.ndef.type4&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -119683,6 +119642,23 @@ 
<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="formatReadOnly"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="firstMessage" type="android.nfc.NdefMessage">

</parameter>

<exception name="FormatException" type="android.nfc.FormatException">

</exception>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="get"

 return="android.nfc.tech.NdefFormatable"

 abstract="false"
@@ -119979,8 +119955,8 @@ 
 visibility="public"

>

</method>

<method name="reconnect"

 return="void"

<method name="isConnected"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"
@@ -119989,8 +119965,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<exception name="IOException" type="java.io.IOException">

</exception>

</method>

</interface>

</package>