drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'b7d6ffd76f6c47af488494f5de9560ec490e8241':
  Change signature of MifareClassic.authenticate*() to throw IOException.
This commit is contained in:
Nick Pelly
2011-01-18 18:56:45 -08:00
committed by Android Git Automerger
parent 8216044435 b7d6ffd76f
commit e5099cd3f5
2 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
api/current.xml
View File

@ -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,6 +103231,19 @@
visibility="public"
>
</method>
<method name="setTimeout"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="timeout" type="int">
</parameter>
</method>
<method name="transceive"
return="byte[]"
abstract="false"
@ -103219,19 +103259,6 @@
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="setTimeout"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="timeout" type="int">
</parameter>
</method>
</class>
<class name="MifareClassic"
extends="android.nfc.technology.BasicTagTechnology"
@ -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"

4
core/java/android/nfc/technology/MifareClassic.java
View File

@ -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);