From 3cd88de2b339e61fb46d186270ed7e5c617ca2b2 Mon Sep 17 00:00:00 2001
From: Soonil Nagarkar <sooniln@google.com>
Date: Thu, 28 Oct 2021 10:15:04 -0700
Subject: [PATCH] Save alarm resources

Cancel unnecessary alarms.

Bug: 198998966
Test: manual + presubmits
Change-Id: Ia6af9cf34c164ba14a1de9c7e5eaa9d7c75a8cfa
---
 .../server/location/provider/LocationProviderManager.java    | 5 +++++
 1 file changed, 5 insertions(+)

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 345dc217110b3..72ab8c1e2d1ad 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 @@ public class LocationProviderManager extends
                         + TimeUtils.formatDuration(delayMs));
             }
 
+            if (mDelayedRegister != null) {
+                mAlarmHelper.cancel(mDelayedRegister);
+                mDelayedRegister = null;
+            }
+
             mDelayedRegister = new OnAlarmListener() {
                 @Override
                 public void onAlarm() {