am 130ba7da: am de5c3a04: Merge "Handle unknown case in LocationManager.getProvider" into jb-mr1-dev

* commit '130ba7dae85afc46e0066114a33acba5eee7530c':
  Handle unknown case in LocationManager.getProvider

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

@@ -1340,6 +1340,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
      */
     @Override
     public ProviderProperties getProviderProperties(String provider) {
+        if (mProvidersByName.get(provider) == null) {
+          return null;
+        }
+
         checkPermissionForProvider(getBestCallingPermission(), provider);
 
         LocationProviderInterface p;