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

am c4eee776: am 07e6f616: Check NDEF before calling makeReadOnly().

Browse Source 
* commit 'c4eee776ad9d3de99032984fe20f5de395888bc7':
  Check NDEF before calling makeReadOnly().
This commit is contained in:
Martijn Coenen
2011-01-21 14:36:33 -08:00
committed by Android Git Automerger
parent ed8bb922c2 c4eee776ad
commit ed0c705f3e
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/nfc/technology/Ndef.java
View File

@@ -221,18 +221,23 @@ public final class Ndef extends BasicTagTechnology {
checkConnected();
try {
int errorCode = mTagService.ndefMakeReadOnly(mTag.getServiceHandle());
switch (errorCode) {
case ErrorCodes.SUCCESS:
return true;
case ErrorCodes.ERROR_IO:
throw new IOException();
case ErrorCodes.ERROR_INVALID_PARAM:
return false;
default:
// Should not happen
throw new IOException();
}
if (mTagService.isNdef(mTag.getServiceHandle())) {
int errorCode = mTagService.ndefMakeReadOnly(mTag.getServiceHandle());
switch (errorCode) {
case ErrorCodes.SUCCESS:
return true;
case ErrorCodes.ERROR_IO:
throw new IOException();
case ErrorCodes.ERROR_INVALID_PARAM:
return false;
default:
// Should not happen
throw new IOException();
}
}
else {
throw new IOException("Tag is not ndef");
}
} catch (RemoteException e) {
Log.e(TAG, "NFC service dead", e);
return false;