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

Commit 4d346b74 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Guard isProviderPackage with permission"

parents 91712642 514dff4f

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3404,7 +3404,7 @@ package android.location { 
    method public boolean isExtraLocationControllerPackageEnabled();

    method public boolean isLocationEnabledForUser(@NonNull android.os.UserHandle);

    method public boolean isProviderEnabledForUser(@NonNull String, @NonNull android.os.UserHandle);

    method public boolean isProviderPackage(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public boolean isProviderPackage(@NonNull String);

    method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean registerGnssBatchedLocationCallback(long, boolean, @NonNull android.location.BatchedLocationCallback, @Nullable android.os.Handler);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull android.location.LocationListener, @Nullable android.os.Looper);

    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_COARSE_LOCATION, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void requestLocationUpdates(@NonNull android.location.LocationRequest, @NonNull android.app.PendingIntent);

location/java/android/location/LocationManager.java

+1 −0
Original line number Diff line number Diff line
@@ -2314,6 +2314,7 @@ public class LocationManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.READ_DEVICE_CONFIG)

    public boolean isProviderPackage(@NonNull String packageName) {

        try {

            return mService.isProviderPackage(packageName);

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

+2 −0
Original line number Diff line number Diff line
@@ -3071,6 +3071,8 @@ public class LocationManagerService extends ILocationManager.Stub { 


    @Override

    public boolean isProviderPackage(String packageName) {

        mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_DEVICE_CONFIG,

                Manifest.permission.READ_DEVICE_CONFIG + " permission required");

        synchronized (mLock) {

            for (LocationProvider provider : mProviders) {

                if (provider.getPackagesLocked().contains(packageName)) {