Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b79ed83 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 56e7ba29: Merge change 21510 into eclair 

Merge commit '56e7ba29'

* commit '56e7ba29':
  LocationManagerService: Add NullPointerException to avoid change in behavior.
parents d6ba4c24 56e7ba29

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

+5 −0
Original line number Diff line number Diff line
@@ -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