diff options
| author | Nick Pelly <npelly@google.com> | 2011-01-21 15:30:32 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-01-21 15:30:32 -0800 |
| commit | 5cfbda15425d078224405950c4be92471279f917 (patch) | |
| tree | 4705b5d83d39765d909469c599e87ce5a77fb9a0 /core | |
| parent | a4f8e903c3b4be9a840e0495be5bbfdb2a0a21e1 (diff) | |
| parent | e5099cd3f58808e3d636c1b0cbbf5dfed9af3b08 (diff) | |
| download | frameworks_base-5cfbda15425d078224405950c4be92471279f917.zip frameworks_base-5cfbda15425d078224405950c4be92471279f917.tar.gz frameworks_base-5cfbda15425d078224405950c4be92471279f917.tar.bz2 | |
resolved conflicts for merge of e5099cd3 to honeycomb-plus-aosp
Change-Id: Iba86e222e4335e832c19ab7b82b74f23e25a5ac0
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); |