Skip to content

Commit b7f9d25

Browse files
committed
Handle unknown case in LocationManager.getProvider
If a provider is unknown, return null in LocationManagerService.getProviderProperties() instead of throwing a security exception, so that LocationManager.getProvider() returns null in this case, as specified by the javadoc. Bug: 7359960 Change-Id: I1b8b74745f66717a3439a1d353a46a23272cc313
1 parent 4682cf0 commit b7f9d25

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1340,6 +1340,10 @@ public boolean sendNiResponse(int notifId, int userResponse) {
13401340
*/
13411341
@Override
13421342
public ProviderProperties getProviderProperties(String provider) {
1343+
if (mProvidersByName.get(provider) == null) {
1344+
return null;
1345+
}
1346+
13431347
checkPermissionForProvider(getBestCallingPermission(), provider);
13441348

13451349
LocationProviderInterface p;

0 commit comments

Comments
 (0)