Merge "Save alarm resources" into sc-v2-dev

2021-10-28 18:58:44 +00:00
parent b16d94b4fb 3cd88de2b3
commit 6665ad79a3
1 changed files with 5 additions and 0 deletions
--- 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 @@ public class LocationProviderManager extends
                        + TimeUtils.formatDuration(delayMs));
            }

+            if (mDelayedRegister != null) {
+                mAlarmHelper.cancel(mDelayedRegister);
+                mDelayedRegister = null;
+            }
+
            mDelayedRegister = new OnAlarmListener() {
                @Override
                public void onAlarm() {