am 56e7ba29: Merge change 21510 into eclair

Merge commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c'

* commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c':
  LocationManagerService: Add NullPointerException to avoid change in behavior.

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

@@ -1100,6 +1100,11 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
     }
 
     public boolean sendExtraCommand(String provider, String command, Bundle extras) {
+        if (provider == null) {
+            // throw NullPointerException to remain compatible with previous implementation
+            throw new NullPointerException();
+        }
+
         // first check for permission to the provider
         checkPermissionsSafe(provider);
         // and check for ACCESS_LOCATION_EXTRA_COMMANDS