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

Commit da20efd9 authored by Nick Pelly's avatar Nick Pelly Committed by Android Git Automerger
Browse files

am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread 

* commit 'cbf0983e':
  Final final final Gingerbread MR API changes.
parents b04ec6a8 cbf0983e

api/10.xml

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

>

</field>

<field name="ACTION_TECHNOLOGY_DISCOVERED"

<field name="ACTION_TECH_DISCOVERED"

 type="java.lang.String"

 transient="false"

 volatile="false"
@@ -100975,29 +100975,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"
@@ -101145,19 +101128,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"
@@ -101745,7 +101715,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="canMakeReadonly"

<method name="canMakeReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -101807,7 +101777,7 @@ 
</exception>

</method>

<method name="getType"

 return="int"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"
@@ -101828,7 +101798,7 @@ 
 visibility="public"

>

</method>

<method name="makeReadonly"

<method name="makeReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -101859,10 +101829,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"
@@ -101870,10 +101840,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"
@@ -101881,10 +101851,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"
@@ -101892,10 +101862,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"
@@ -101903,21 +101873,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"
@@ -101950,6 +101909,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"
@@ -102246,8 +102222,8 @@ 
 visibility="public"

>

</method>

<method name="reconnect"

 return="void"

<method name="isConnected"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"
@@ -102256,8 +102232,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

</exception>

</method>

</interface>

</package>

api/current.xml

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

>

</field>

<field name="ACTION_TECHNOLOGY_DISCOVERED"

<field name="ACTION_TECH_DISCOVERED"

 type="java.lang.String"

 transient="false"

 volatile="false"
@@ -102995,29 +102995,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"
@@ -103165,19 +103148,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"
@@ -103765,7 +103735,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<method name="canMakeReadonly"

<method name="canMakeReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -103827,7 +103797,7 @@ 
</exception>

</method>

<method name="getType"

 return="int"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"
@@ -103848,7 +103818,7 @@ 
 visibility="public"

>

</method>

<method name="makeReadonly"

<method name="makeReadOnly"

 return="boolean"

 abstract="false"

 native="false"
@@ -103879,10 +103849,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"
@@ -103890,10 +103860,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"
@@ -103901,10 +103871,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"
@@ -103912,10 +103882,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"
@@ -103923,21 +103893,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"
@@ -103970,6 +103929,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"
@@ -104266,8 +104242,8 @@ 
 visibility="public"

>

</method>

<method name="reconnect"

 return="void"

<method name="isConnected"

 return="boolean"

 abstract="true"

 native="false"

 synchronized="false"
@@ -104276,8 +104252,6 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

</exception>

</method>

</interface>

</package>

core/java/android/nfc/NfcAdapter.java

+3 −3
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ public final class NfcAdapter { 
    /**

     * Intent to start an activity when a tag with NDEF payload is discovered.

     * If the tag has and NDEF payload this intent is started before

     * {@link #ACTION_TECHNOLOGY_DISCOVERED}.

     * {@link #ACTION_TECH_DISCOVERED}.

     *

     * If any activities respond to this intent neither

     * {@link #ACTION_TECHNOLOGY_DISCOVERED} or {@link #ACTION_TAG_DISCOVERED} will be started.

     * {@link #ACTION_TECH_DISCOVERED} or {@link #ACTION_TAG_DISCOVERED} will be started.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_NDEF_DISCOVERED = "android.nfc.action.NDEF_DISCOVERED";
@@ -63,7 +63,7 @@ public final class NfcAdapter { 
     * If any activities respond to this intent {@link #ACTION_TAG_DISCOVERED} will not be started.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_TECHNOLOGY_DISCOVERED = "android.nfc.action.TECH_DISCOVERED";

    public static final String ACTION_TECH_DISCOVERED = "android.nfc.action.TECH_DISCOVERED";



    /**

     * Intent to start an activity when a tag is discovered.

core/java/android/nfc/Tag.java

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ import java.util.Arrays; 
 * not cause any further RF activity or block. Note however that arrays passed to and

 * returned by this class are *not* cloned, so be careful not to modify them.

 */

public class Tag implements Parcelable {

public final class Tag implements Parcelable {

    /*package*/ final byte[] mId;

    /*package*/ final int[] mTechList;

    /*package*/ final String[] mTechStringList;
@@ -93,6 +93,7 @@ public class Tag implements Parcelable { 
     * @param id The tag identifier, can be null

     * @param techList must not be null

     * @return freshly constructed tag

     * @hide

     */

    public static Tag createMockTag(byte[] id, int[] techList, Bundle[] techListExtras) {

        // set serviceHandle to 0 to indicate mock tag

core/java/android/nfc/tech/BasicTagTechnology.java

+2 −9
Original line number Diff line number Diff line
@@ -53,15 +53,7 @@ import java.io.IOException; 
       }

    }



    /**

     * Helper to indicate if {@link #connect} has succeeded.

     * <p>

     * Does not cause RF activity, and does not block.

     * @return true if {@link #connect} has completed successfully and the {@link Tag} is believed

     * to be within range. Applications must still handle {@link java.io.IOException}

     * while using methods that require a connection in case the connection is lost after this

     * method returns.

     */

    @Override

    public boolean isConnected() {

        if (!mIsConnected) {

            return false;
@@ -94,6 +86,7 @@ import java.io.IOException; 
        }

    }



    /** @hide */

    @Override

    public void reconnect() throws IOException {

        if (!mIsConnected) {