commit 25d0d25fcbed48384ba2c78708616b044b29aa5b
author Yu-Han Yang <yuhany@google.com> Thu Jun 25 10:53:58 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Thu Jun 25 18:55:47 2020 +0000
tree 5029374ae6e45e7867d7afd4a6b9ac92fa1c77eb
parent 63899596beafa18df6e2ec61f46a2be11c77b5c1

Fix under-locked wakelock

Bug: 159851863
Test: on device
Change-Id: I09e799ad1510bb6f8b5883a73e0a5d552fa36f88
(cherry picked from commit a5ad3b54c7b7d2e5a67aee41f94d2697ef49791b)

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

diff --git a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
index 77fefb4..8aaf4bf 100644
--- a/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/gnss/GnssLocationProvider.java
@@ -844,9 +844,10 @@
 
             if (data == null) {
                 // try again later
-                // since this is delayed and not urgent we do not hold a wake lock her
+                // since this is delayed and not urgent we do not hold a wake lock here
+                // the arg2 below should not be 1 otherwise the wakelock will be under-locked.
                 mHandler.sendMessageDelayed(
-                        mHandler.obtainMessage(DOWNLOAD_PSDS_DATA, psdsType, 1, null),
+                        mHandler.obtainMessage(DOWNLOAD_PSDS_DATA, psdsType, 0, null),
                         mPsdsBackOff.nextBackoffMillis());
             }