diff options
| -rw-r--r-- | location/java/android/location/LocationManager.java | 8 | ||||
| -rw-r--r-- | services/core/java/com/android/server/LocationManagerService.java | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index ced3ec9..36778aa 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -28,6 +28,7 @@ import android.os.Message; import android.util.Log; +import java.lang.SecurityException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -1104,13 +1105,18 @@ public class LocationManager { * unless they depend on provider-specific APIs such as * {@link #requestLocationUpdates(String, long, float, LocationListener)}. * + * <p> + * Before API version 20, this method would throw {@link SecurityException} + * if the location permissions were not sufficient to use the specified + * provider. + * * @param provider the name of the provider * @return true if the provider exists and is enabled * * @throws IllegalArgumentException if provider is null - * @throws SecurityException if no suitable permission is present */ public boolean isProviderEnabled(String provider) { + // STOPSHIP: finalize API version number in javadoc checkProvider(provider); try { diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java index fc68205..1eedaae 100644 --- a/services/core/java/com/android/server/LocationManagerService.java +++ b/services/core/java/com/android/server/LocationManagerService.java @@ -1790,10 +1790,6 @@ public class LocationManagerService extends ILocationManager.Stub { @Override public boolean isProviderEnabled(String provider) { - // TODO: remove this check in next release, see b/10696351 - checkResolutionLevelIsSufficientForProviderUse(getCallerAllowedResolutionLevel(), - provider); - // Fused provider is accessed indirectly via criteria rather than the provider-based APIs, // so we discourage its use if (LocationManager.FUSED_PROVIDER.equals(provider)) return false; |