Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev

Author: Victoria Lease

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

@@ -1292,8 +1292,13 @@ public ProviderProperties getProviderProperties(String provider) {
 
     @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);