Merge "Don't return passive location provider unless app has fine permissions."

2010-02-18 06:38:12 -08:00
parent bf8f3a888c 43cc4696bf
commit 4b9f74a2d3
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -561,7 +561,8 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
    }

    private boolean isAllowedProviderSafe(String provider) {
-        if (LocationManager.GPS_PROVIDER.equals(provider)
+        if ((LocationManager.GPS_PROVIDER.equals(provider)
+                || LocationManager.PASSIVE_PROVIDER.equals(provider))
            && (mContext.checkCallingOrSelfPermission(ACCESS_FINE_LOCATION)
                != PackageManager.PERMISSION_GRANTED)) {
            return false;