commit f3d7dd6bd4763d5300c2be1cd2930acf712e80c5
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 21 01:23:45 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 21 01:23:45 2019 +0000
tree 1cc20822ef6a21f5a691c529cf4972c97a1edc43
parent 980af3e00262d1fa35de227a5f79bdfeaf4eab19
parent 04cff6c9cd545a37159237fc8dfcb1f4dccb5f9a

Merge "Ensure test provider turns real provider off"

services/core/java/com/android/server/LocationManagerService.java

diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index ceeb539..31010c9 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -1824,12 +1824,7 @@
     @GuardedBy("mLock")
     private void removeProviderLocked(LocationProvider provider) {
         if (mProviders.remove(provider)) {
-            long identity = Binder.clearCallingIdentity();
-            try {
-                provider.onUseableChangedLocked(false);
-            } finally {
-                Binder.restoreCallingIdentity(identity);
-            }
+            provider.onUseableChangedLocked(false);
         }
     }
 
@@ -2108,7 +2103,9 @@
         WorkSource worksource = new WorkSource();
         ProviderRequest providerRequest = new ProviderRequest();
 
-        if (records != null && !records.isEmpty()) {
+        // if provider is not active, it should not respond to requests
+
+        if (mProviders.contains(provider) && records != null && !records.isEmpty()) {
             long backgroundThrottleInterval;
 
             long identity = Binder.clearCallingIdentity();