commit 072ea78e70502bfe7012c0bc841b7eed1b83cfdd
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 28 19:13:51 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 28 19:13:51 2021 +0000
tree 6e4cac3ee8188ddbca388f1f95b3cafe43f1adf2
parent dc40681a14b94f5e69421e34b258c430ec627f96
parent 6665ad79a36984763110a0d4a0a21e24845368f5

Merge "Save alarm resources" into sc-v2-dev am: 6665ad79a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16141434

Change-Id: I0a6340486e3dc4195b8c31ac96964e91b21150fe

services/core/java/com/android/server/location/provider/LocationProviderManager.java

diff --git a/services/core/java/com/android/server/location/provider/LocationProviderManager.java b/services/core/java/com/android/server/location/provider/LocationProviderManager.java
index 83de0b3..cbca48c9 100644
--- a/services/core/java/com/android/server/location/provider/LocationProviderManager.java
+++ b/services/core/java/com/android/server/location/provider/LocationProviderManager.java
@@ -1996,6 +1996,11 @@
                         + TimeUtils.formatDuration(delayMs));
             }
 
+            if (mDelayedRegister != null) {
+                mAlarmHelper.cancel(mDelayedRegister);
+                mDelayedRegister = null;
+            }
+
             mDelayedRegister = new OnAlarmListener() {
                 @Override
                 public void onAlarm() {