commit 5babb6b8ff75d093b17d638f3c2ec57549053828
author Wei Wang <weiwa@google.com> Thu Apr 20 00:23:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 00:23:42 2017 +0000
tree b606a2f557447a1374faf12f6fea91a56129e6be
parent e09cbb8bbf31d0f00864faf3380717ecb036e684
parent dca07572d977a0c3e691494c4dba136cc4b9d97e

Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev am: b1f7358d98
am: dca07572d9

Change-Id: I81e91999c4a289caceea2407f62ef417c4b71072

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 8fe021c..2704c44 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -290,6 +290,9 @@
     // current setting - 4 hours
     private static final long MAX_RETRY_INTERVAL = 4*60*60*1000;
 
+    // Timeout when holding wakelocks for downloading XTRA data.
+    private static final long DOWNLOAD_XTRA_DATA_TIMEOUT_MS = 60 * 1000;
+
     private BackOff mNtpBackOff = new BackOff(RETRY_INTERVAL, MAX_RETRY_INTERVAL);
     private BackOff mXtraBackOff = new BackOff(RETRY_INTERVAL, MAX_RETRY_INTERVAL);
 
@@ -992,7 +995,7 @@
         mDownloadXtraDataPending = STATE_DOWNLOADING;
 
         // hold wake lock while task runs
-        mWakeLock.acquire();
+        mWakeLock.acquire(DOWNLOAD_XTRA_DATA_TIMEOUT_MS);
         Log.i(TAG, "WakeLock acquired by handleDownloadXtraData()");
         AsyncTask.THREAD_POOL_EXECUTOR.execute(new Runnable() {
             @Override
@@ -1015,7 +1018,11 @@
                 }
 
                 // release wake lock held by task
-                mWakeLock.release();
+                if (mWakeLock.isHeld()) {
+                    mWakeLock.release();
+                } else {
+                    Log.e(TAG, "WakeLock expired before release in handleDownloadXtraData()");
+                }
                 Log.i(TAG, "WakeLock released by handleDownloadXtraData()");
             }
         });