Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp

Browse Source 
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
This commit is contained in:
Nick Pelly
2011-01-21 15:30:32 -08:00
parent a4f8e903c3 e5099cd3f5
commit 5cfbda1542
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
api/current.xml
View File

@@ -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"

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