Fix bug where NfcAdapterExtras.get() always fails.

And improve some logging while we're at it.

Change-Id: Ia1f5c1a451690bfcf5b9af75e855c09164460561

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index ca3bbb3..a9b7533 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -290,6 +290,7 @@ public class NfcService extends Application implements DeviceHostListener, P2pSt
 
         mNfcTagService = new TagService();
         mNfcAdapter = new NfcAdapterService();
+        mExtrasService = new NfcAdapterExtrasService();
 
         Log.i(TAG, "Starting NFC service");
 
@@ -504,7 +505,7 @@ public class NfcService extends Application implements DeviceHostListener, P2pSt
             boolean tempEnable = mState == NfcAdapter.STATE_OFF;
             if (tempEnable) {
                 if (!enableInternal()) {
-                    Log.w(TAG, "Could not enable NFC to wipe Secure Element");
+                    Log.w(TAG, "Could not enable NFC to wipe NFC-EE");
                     return;
                 }
             }
@@ -521,7 +522,11 @@ public class NfcService extends Application implements DeviceHostListener, P2pSt
             mDeviceHost.setTimeout(TagTechnology.ISO_DEP, 10000);
 
             for (byte[] cmd : apdus) {
-                mSecureElement.doTransceive(handle, cmd);
+                byte[] resp = mSecureElement.doTransceive(handle, cmd);
+                if (resp == null) {
+                    Log.w(TAG, "Transceive failed, could not wipe NFC-EE");
+                    break;
+                }
             }
 
             mDeviceHost.resetTimeouts();