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

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

am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to throw... 

am b7d6ffd7: Merge "Change signature of MifareClassic.authenticate*() to throw IOException." into gingerbread

* commit 'b7d6ffd7':
  Change signature of MifareClassic.authenticate*() to throw IOException.
parents 82160444 b7d6ffd7

api/current.xml

+39 −8
Original line number Diff line number Diff line
@@ -103090,6 +103090,33 @@ 
>

</field>

</class>

<class name="TagLostException"

 extends="java.io.IOException"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="TagLostException"

 type="android.nfc.TagLostException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<constructor name="TagLostException"

 type="android.nfc.TagLostException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="message" type="java.lang.String">

</parameter>

</constructor>

</class>

</package>

<package name="android.nfc.technology"

>
@@ -103204,8 +103231,8 @@ 
 visibility="public"

>

</method>

<method name="transceive"

 return="byte[]"

<method name="setTimeout"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"
@@ -103214,13 +103241,11 @@ 
 deprecated="not deprecated"

 visibility="public"

>

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

<parameter name="timeout" type="int">

</parameter>

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

</exception>

</method>

<method name="setTimeout"

 return="void"

<method name="transceive"

 return="byte[]"

 abstract="false"

 native="false"

 synchronized="false"
@@ -103229,8 +103254,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="timeout" type="int">

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

</parameter>

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

</exception>

</method>

</class>

<class name="MifareClassic"
@@ -103257,6 +103284,8 @@ 
</parameter>

<parameter name="keyA" type="boolean">

</parameter>

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

</exception>

</method>

<method name="authenticateSector"

 return="boolean"
@@ -103274,6 +103303,8 @@ 
</parameter>

<parameter name="keyA" type="boolean">

</parameter>

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

</exception>

</method>

<method name="decrement"

 return="void"

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

+2 −2
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ public final class MifareClassic extends BasicTagTechnology { 
     * Authenticate the entire sector that the given block resides in.

     * <p>This requires a that the tag be connected.

     */

    public boolean authenticateBlock(int block, byte[] key, boolean keyA) throws TagLostException {

    public boolean authenticateBlock(int block, byte[] key, boolean keyA) throws IOException {

        checkConnected();



        byte[] cmd = new byte[12];
@@ -287,7 +287,7 @@ public final class MifareClassic extends BasicTagTechnology { 
     * Authenticate for a given sector.

     * <p>This requires a that the tag be connected.

     */

    public boolean authenticateSector(int sector, byte[] key, boolean keyA) throws TagLostException {

    public boolean authenticateSector(int sector, byte[] key, boolean keyA) throws IOException {

        checkConnected();



        byte addr = (byte) ((firstBlockInSector(sector)) & 0xff);