diff options
| author | Nick Pelly <npelly@google.com> | 2011-01-21 16:05:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-21 16:05:47 -0800 |
| commit | a53086c088bc509688b0b4d01f947a7f5fbb3ed4 (patch) | |
| tree | 7d7478265f0d40ea6d4d159841a1c01be3683b04 /core | |
| parent | 61d4504ec66827924f926e99361ebf432c2390cb (diff) | |
| parent | 5cfbda15425d078224405950c4be92471279f917 (diff) | |
| download | frameworks_base-a53086c088bc509688b0b4d01f947a7f5fbb3ed4.zip frameworks_base-a53086c088bc509688b0b4d01f947a7f5fbb3ed4.tar.gz frameworks_base-a53086c088bc509688b0b4d01f947a7f5fbb3ed4.tar.bz2 | |
am 5cfbda15: resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
* commit '5cfbda15425d078224405950c4be92471279f917':
Change signature of MifareClassic.authenticate*() to throw IOException.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/nfc/technology/MifareClassic.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/nfc/technology/MifareClassic.java b/core/java/android/nfc/technology/MifareClassic.java index ac87919..a2abaa3 100644 --- a/core/java/android/nfc/technology/MifareClassic.java +++ b/core/java/android/nfc/technology/MifareClassic.java @@ -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); |