Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c4942e9 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "LocationManagerService: The "value" was used as a Map.remove(key)... 

Merge "LocationManagerService: The "value" was used as a Map.remove(key) method parameter." into jellybean
parents fb4261a5 fa7a778e

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

+1 −2
Original line number Diff line number Diff line
@@ -2286,13 +2286,12 @@ public class LocationManagerService extends ILocationManager.Stub implements Run 
    public void removeTestProvider(String provider) {

        checkMockPermissionsSafe();

        synchronized (mLock) {

            MockProvider mockProvider = mMockProviders.get(provider);

            MockProvider mockProvider = mMockProviders.remove(provider);

            if (mockProvider == null) {

                throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");

            }

            long identity = Binder.clearCallingIdentity();

            removeProvider(mProvidersByName.get(provider));

            mMockProviders.remove(mockProvider);

            // reinstall real provider if we were mocking GPS or network provider

            if (LocationManager.GPS_PROVIDER.equals(provider) &&

                    mGpsLocationProvider != null) {