am cfebfb68: am fc6770e7: Merge "Remove checkPermission() call in getAllProviders()." into jb-mr1-dev

* commit 'cfebfb6802c24b4b1166b95bd07b5865f847f9f1':
  Remove checkPermission() call in getAllProviders().

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

@@ -645,12 +645,11 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
 
     /**
      * Returns all providers by name, including passive, but excluding
-     * fused.
+     * fused, also including ones that are not permitted to
+     * be accessed by the calling activity or are currently disabled.
      */
     @Override
     public List<String> getAllProviders() {
-        checkPermission();
-
         ArrayList<String> out;
         synchronized (mLock) {
             out = new ArrayList<String>(mProviders.size());