Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5b6069ce: Merge "Wrong parameter in LocationManagerService"

Browse Source 
* commit '5b6069ce3a87d30960e9ef5870299db90090776b':
  Wrong parameter in LocationManagerService
This commit is contained in:
Victoria Lease
2012-12-07 12:18:37 -08:00
committed by Android Git Automerger
parent d6afe94a2a 5b6069ce3a
commit aec227148d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/LocationManagerService.java
View File

@@ -1885,13 +1885,12 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
public void removeTestProvider(String provider) { public void removeTestProvider(String provider) {
checkMockPermissionsSafe(); checkMockPermissionsSafe();
synchronized (mLock) { synchronized (mLock) {
MockProvider mockProvider = mMockProviders.get(provider); MockProvider mockProvider = mMockProviders.remove(provider);
if (mockProvider == null) { if (mockProvider == null) {
throw new IllegalArgumentException("Provider \"" + provider + "\" unknown"); throw new IllegalArgumentException("Provider \"" + provider + "\" unknown");
} }
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
removeProviderLocked(mProvidersByName.get(provider)); removeProviderLocked(mProvidersByName.get(provider));
mMockProviders.remove(mockProvider);
// reinstate real provider if available // reinstate real provider if available
LocationProviderInterface realProvider = mRealProviders.get(provider); LocationProviderInterface realProvider = mRealProviders.get(provider);