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

Commit 0316d4a2 authored by Nick Pelly's avatar Nick Pelly
Browse files

Change signature of MifareClassic.authenticate*() to throw IOException. 

Update API for this and the previous commit.

Change-Id: I19275a5d00081bd0f00afea59a2b673344a32954
parent bf34061b

api/current.xml

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

>

</field>

</field>

</class>

</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>

<package name="android.nfc.technology"

<package name="android.nfc.technology"

>

>
@@ -101184,8 +101211,8 @@ 
 visibility="public"

 visibility="public"

>

>

</method>

</method>

<method name="transceive"

<method name="setTimeout"

 return="byte[]"

 return="void"

 abstract="false"

 abstract="false"

 native="false"

 native="false"

 synchronized="false"

 synchronized="false"
@@ -101194,13 +101221,11 @@ 
 deprecated="not deprecated"

 deprecated="not deprecated"

 visibility="public"

 visibility="public"

>

>

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

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

</parameter>

</parameter>

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

</exception>

</method>

</method>

<method name="setTimeout"

<method name="transceive"

 return="void"

 return="byte[]"

 abstract="false"

 abstract="false"

 native="false"

 native="false"

 synchronized="false"

 synchronized="false"
@@ -101209,8 +101234,10 @@ 
 deprecated="not deprecated"

 deprecated="not deprecated"

 visibility="public"

 visibility="public"

>

>

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

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

</parameter>

</parameter>

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

</exception>

</method>

</method>

</class>

</class>

<class name="MifareClassic"

<class name="MifareClassic"
@@ -101237,6 +101264,8 @@ 
</parameter>

</parameter>

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

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

</parameter>

</parameter>

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

</exception>

</method>

</method>

<method name="authenticateSector"

<method name="authenticateSector"

 return="boolean"

 return="boolean"
@@ -101254,6 +101283,8 @@ 
</parameter>

</parameter>

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

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

</parameter>

</parameter>

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

</exception>

</method>

</method>

<method name="decrement"

<method name="decrement"

 return="void"

 return="void"

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

+2 −2
Original line number Original line 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.

     * Authenticate the entire sector that the given block resides in.

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

     * <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();

        checkConnected();





        byte[] cmd = new byte[12];

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

     * Authenticate for a given sector.

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

     * <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();

        checkConnected();





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

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