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

Merge "Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present." into lmp-mr1-dev

Browse Source
This commit is contained in:
Takayuki Hoshi
2014-10-24 04:02:51 +00:00
committed by Android (Google) Code Review
parent 35658cc42e b254ab6add
commit ee57224c0f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/LocationManagerService.java
View File

@@ -1796,9 +1796,6 @@ public class LocationManagerService extends ILocationManager.Stub {
@Override @Override
public boolean addGpsStatusListener(IGpsStatusListener listener, String packageName) { public boolean addGpsStatusListener(IGpsStatusListener listener, String packageName) {
if (mGpsStatusProvider == null) {
return false;
}
int allowedResolutionLevel = getCallerAllowedResolutionLevel(); int allowedResolutionLevel = getCallerAllowedResolutionLevel();
checkResolutionLevelIsSufficientForProviderUse(allowedResolutionLevel, checkResolutionLevelIsSufficientForProviderUse(allowedResolutionLevel,
LocationManager.GPS_PROVIDER); LocationManager.GPS_PROVIDER);
@@ -1813,6 +1810,10 @@ public class LocationManagerService extends ILocationManager.Stub {
Binder.restoreCallingIdentity(ident); Binder.restoreCallingIdentity(ident);
} }
if (mGpsStatusProvider == null) {
return false;
}
try { try {
mGpsStatusProvider.addGpsStatusListener(listener); mGpsStatusProvider.addGpsStatusListener(listener);
} catch (RemoteException e) { } catch (RemoteException e) {