From afecea18054c457cbd55d1ed9c023f2c2aa3726b Mon Sep 17 00:00:00 2001
From: Tom O'Neill <tomo@google.com>
Date: Fri, 28 Feb 2014 17:38:31 -0800
Subject: Seeing if a provider is enabled doesn't require special permissions

- Bug: 10696351

Change-Id: I4f1612ce10587728e71277587144fdcb59445b3f
---
 location/java/android/location/LocationManager.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'location/java/android')

diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index ced3ec92ff6c..36778aaafdac 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 {
-- 
cgit v1.2.3-59-g8ed1b