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

Commit a6d0b6f8 authored by You Kim's avatar You Kim Committed by Victoria Lease
Browse files

Fix Wrong parameter in HashMap.remove 



Change-Id: Ibf93833697c865904f29821e5778853127e5fb00
Signed-off-by: default avatarYou Kim <you.kim72@gmail.com>

Conflicts:

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

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

+1 −2
Original line number Diff line number Diff line
@@ -1884,13 +1884,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();

            removeProviderLocked(mProvidersByName.get(provider));

            mMockProviders.remove(mockProvider);



            // reinstate real provider if available

            LocationProviderInterface realProvider = mRealProviders.get(provider);