commit 3cceb2580484bb97d7665ad2eefe738c37e287d9
author Zheng Zhang <zhzh@google.com> Mon Aug 07 13:51:23 2017 -0700
committer Zheng Zhang <zhzh@google.com> Mon Aug 07 21:18:35 2017 +0000
tree dd8ce1fddb98e2ec8907bdad10947b32f22fe392
parent 8ce50255c54ccb25d93263afbd76edec55c00d80

Catch (and ignore) any timeout exceptions when releasing WakeLock

Bug: 64424030
Change-Id: I4f1f71bc4f16d1485b360aec70c82818aa7510fb

services/core/java/com/android/server/location/GnssLocationProvider.java

diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 11a4eb4..436ea3c 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -1054,8 +1054,15 @@
                 // download tasks overrun.
                 synchronized (mLock) {
                     if (mDownloadXtraWakeLock.isHeld()) {
-                        mDownloadXtraWakeLock.release();
-                        if (DEBUG) Log.d(TAG, "WakeLock released by handleDownloadXtraData()");
+                        // This wakelock may have time-out, if a timeout was specified.
+                        // Catch (and ignore) any timeout exceptions.
+                        try {
+                            mDownloadXtraWakeLock.release();
+                            if (DEBUG) Log.d(TAG, "WakeLock released by handleDownloadXtraData()");
+                        } catch (Exception e) {
+                            Log.i(TAG, "Wakelock timeout & release race exception in "
+                                    + "handleDownloadXtraData()", e);
+                        }
                     } else {
                         Log.e(TAG, "WakeLock expired before release in "
                                 + "handleDownloadXtraData()");