Merge "Ensure to release wakelock"

2021-07-09 19:14:35 +00:00
parent d3627fa065 71fb1f2d52
commit 6942541b99
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -1343,8 +1343,11 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
        // it is handled (otherwise the wake lock would be leaked).
        mWakeLock.acquire(WAKELOCK_TIMEOUT_MILLIS);
        boolean success = mHandler.post(() -> {
-            runnable.run();
-            mWakeLock.release();
+            try {
+                runnable.run();
+            } finally {
+                mWakeLock.release();
+            }
        });
        if (!success) {
            mWakeLock.release();