Merge "Ensure test provider turns real provider off" (f3d7dd6b) · Commits · e / os / android_frameworks_base

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -1824,12 +1824,7 @@ public class LocationManagerService extends ILocationManager.Stub {
		@GuardedBy("mLock")
		private void removeProviderLocked(LocationProvider provider) {
		if (mProviders.remove(provider)) {
		long identity = Binder.clearCallingIdentity();
		try {
		provider.onUseableChangedLocked(false);
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		}
		}

		@@ -2108,7 +2103,9 @@ public class LocationManagerService extends ILocationManager.Stub {
		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();