diff options
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index e8fc9e4..ca1713d 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -1420,7 +1420,7 @@ public class NfcService extends Application implements DeviceHostListener { synchronized (this) { if (!mWatchDogCanceled) { // Trigger watch-dog - Log.e(TAG, "Watch dog triggered"); + Log.e(TAG, "--- NFC controller stuck while applying routing ---"); mDeviceHost.doAbort(); } } @@ -1840,7 +1840,11 @@ public class NfcService extends Application implements DeviceHostListener { } mScreenState = params[0].intValue(); - mRoutingWakeLock.acquire(); + // HACK: We've seen applying the routing configuration + // getting stuck. The operation should normally easily + // complete within a minute, so don't hold the wakelock + // any longer than that. + mRoutingWakeLock.acquire(60000); try { applyRouting(false); } finally { |