summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2013-05-31 14:26:30 -0700
committerMartijn Coenen <maco@google.com>2013-05-31 14:27:25 -0700
commit2b4dc11f4508cdb662a8069cccf9f2273004a4c8 (patch)
tree6bdacd8e4c5cae891be0bb7432594815dd6dc839
parent2f61bcadb10697036a5ce5ad893607f5dcdcda9d (diff)
downloadandroid_packages_apps_Nfc-2b4dc11f4508cdb662a8069cccf9f2273004a4c8.tar.gz
android_packages_apps_Nfc-2b4dc11f4508cdb662a8069cccf9f2273004a4c8.tar.bz2
android_packages_apps_Nfc-2b4dc11f4508cdb662a8069cccf9f2273004a4c8.zip
Check for proper SE open return values on wipe.
Bug: 9227578 Change-Id: Iff9e9512ac4d8e25a287ce40fba7c2717b4419fa
-rwxr-xr-xsrc/com/android/nfc/NfcService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 6ed07fdd..5315a2ee 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -748,7 +748,7 @@ public class NfcService implements DeviceHostListener {
try {
Log.i(TAG, "Executing SE wipe");
handle = doOpenSecureElementConnection();
- if (handle == 0) {
+ if (handle < 0) {
Log.w(TAG, "Could not open the secure element");
return;
}
@@ -772,7 +772,7 @@ public class NfcService implements DeviceHostListener {
mDeviceHost.resetTimeouts();
}
} finally {
- if (handle != 0) {
+ if (handle >= 0) {
doDisconnect(handle);
}
}