commit b741d16abb370b6c09c4226329867e1d3f451a3d
author The Android Automerger <android-build@google.com> Sun Jun 02 05:55:44 2013 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 02 05:55:44 2013 -0700
tree 6bdacd8e4c5cae891be0bb7432594815dd6dc839
parent 2b4dc11f4508cdb662a8069cccf9f2273004a4c8
parent 8563e2137a5574b28dbc0abb6934460907e4d652

merge in jb-mr2-release history after reset to jb-mr2-dev

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 6ed07fd..5315a2e 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -748,7 +748,7 @@
                     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 @@
                             mDeviceHost.resetTimeouts();
                         }
                     } finally {
-                        if (handle != 0) {
+                        if (handle >= 0) {
                             doDisconnect(handle);
                         }
                     }