Fix NFC service wake-lock, again.

1) Put a watchdog on the NFC Service disable path.
All the bug-reports show we were stuck in _disable(), watch-dog
this path (10 seconds).

2) Only attempt a SE reset once, even if it fails the first time.
All the bugs reports should the _disable() was due to SE reset
on first boot.

3) Grab the NFC service lock before the wake-lock.
So even if someone has NFC service lock, at least we don't
hold a wake-lock waiting for it.

Bug: 4581084
Change-Id: Ic9829dddde8d0c67cf0e8e4912357fa2902faa11

2 files changed, 33 insertions, 3 deletions

diff --git a/src/com/android/nfc/NativeNfcManager.java b/src/com/android/nfc/NativeNfcManager.java
index 7e4db32..3f0f532 100755
--- a/src/com/android/nfc/NativeNfcManager.java
+++ b/src/com/android/nfc/NativeNfcManager.java
@@ -92,6 +92,7 @@ public class NativeNfcManager {
 
     public native boolean doActivateLlcp();
 
+    public native void doAbort();
 
     public native void doResetIsoDepTimeout();
     public void resetIsoDepTimeout() {
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 244a3bf..667565b 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1943,6 +1943,10 @@ public class NfcService extends Application {
     }
 
     private boolean _disable(boolean oldEnabledState) {
+        /* sometimes mManager.deinitialize() hangs, watch-dog it */
+        WatchDogThread watchDog = new WatchDogThread();
+        watchDog.start();
+
         boolean isSuccess;
 
         /* tear down the my tag server */
@@ -1970,9 +1974,34 @@ public class NfcService extends Application {
 
         updateNfcOnSetting(oldEnabledState);
 
+        watchDog.cancel();
         return isSuccess;
     }
 
+    private class WatchDogThread extends Thread {
+        boolean mWatchDogCanceled = false;
+        @Override
+        public void run() {
+            boolean slept = false;
+            while (!slept) {
+                try {
+                    Thread.sleep(10000);
+                    slept = true;
+                } catch (InterruptedException e) { }
+            }
+            synchronized (this) {
+                if (!mWatchDogCanceled) {
+                    // Trigger watch-dog
+                    Log.e(TAG, "Watch dog triggered");
+                    mManager.doAbort();
+                }
+            }
+        }
+        public synchronized void cancel() {
+            mWatchDogCanceled = true;
+        }
+    }
+
     /** apply NFC discovery and EE routing */
     private synchronized void applyRouting() {
         if (mIsNfcEnabled && mOpenEe == null) {
@@ -2042,9 +2071,9 @@ public class NfcService extends Application {
     private void resetSeOnFirstBoot() {
         if (mPrefs.getBoolean(PREF_FIRST_BOOT, true)) {
             Log.i(TAG, "First Boot");
-            executeSeReset();
             mPrefsEditor.putBoolean(PREF_FIRST_BOOT, false);
             mPrefsEditor.apply();
+            executeSeReset();
         }
     }
 
@@ -2891,13 +2920,13 @@ public class NfcService extends Application {
                     applyRouting();
                 }
             } else {
-                mWakeLock.acquire();
                 synchronized (NfcService.this) {
+                    mWakeLock.acquire();
                     mScreenOn = false;
                     applyRouting();
                     maybeDisconnectTarget();
+                    mWakeLock.release();
                 }
-                mWakeLock.release();
             }
             return null;
         }