Merge "do not request location from unavailable providers" into klp-dev

packages/FusedLocation/src/com/android/location/fused/FusionEngine.java

@@ -131,6 +131,7 @@ public class FusionEngine implements LocationListener {
     private void enableProvider(String name, long minTime) {
         ProviderStats stats = mStats.get(name);
 
+        if (stats.available) {
             if (!stats.requested) {
                 stats.requestTime = SystemClock.elapsedRealtime();
                 stats.requested = true;
@@ -141,6 +142,7 @@ public class FusionEngine implements LocationListener {
                 mLocationManager.requestLocationUpdates(name, minTime, 0, this, mLooper);
             }
         }
+    }
 
     private void disableProvider(String name) {
         ProviderStats stats = mStats.get(name);

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

@@ -1473,7 +1473,7 @@ public class LocationManagerService extends ILocationManager.Stub {
                 + " " + name + " " + request + " from " + packageName + "(" + uid + ")");
         LocationProviderInterface provider = mProvidersByName.get(name);
         if (provider == null) {
-            throw new IllegalArgumentException("provider doesn't exist: " + provider);
+            throw new IllegalArgumentException("provider doesn't exist: " + name);
         }
 
         UpdateRecord record = new UpdateRecord(name, request, receiver);