am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev

* commit '18c2b6e730f6d639421e45328f4fb2514683efe5': throw SecurityException in isProviderEnabled()
2012-10-04 11:20:55 -07:00
parent a12f347895 18c2b6e730
commit f9d5a079c5
1 changed files with 6 additions and 1 deletions
--- a/services/java/com/android/server/LocationManagerService.java
+++ b/services/java/com/android/server/LocationManagerService.java
@@ -1292,8 +1292,13 @@ public class LocationManagerService extends ILocationManager.Stub implements Run

    @Override
    public boolean isProviderEnabled(String provider) {
-        checkPermission();
+        String perms = checkPermission();
        if (LocationManager.FUSED_PROVIDER.equals(provider)) return false;
+        if (ACCESS_COARSE_LOCATION.equals(perms) &&
+                !isProviderAllowedByCoarsePermission(provider)) {
+            throw new SecurityException("The \"" + provider +
+                    "\" provider requires ACCESS_FINE_LOCATION permission");
+        }

        synchronized (mLock) {
            LocationProviderInterface p = mProvidersByName.get(provider);