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

Commit 2478e617 authored by Nick Pelly's avatar Nick Pelly
Browse files

resolved conflicts for merge of b7d6ffd7 to honeycomb-merge 

Change-Id: If5553e0b51513687c4012600d92323617190fb6c
parents 51ee9c13 b7d6ffd7

api/current.xml

+31 −0
Original line number Diff line number Diff line
@@ -118605,6 +118605,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"

>
@@ -118772,6 +118799,8 @@ 
</parameter>

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

</parameter>

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

</exception>

</method>

<method name="authenticateSector"

 return="boolean"
@@ -118789,6 +118818,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);