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

Commit 3fcb6dfa authored by David Christie's avatar David Christie
Browse files

Revert "Guard isProviderPackage with permission" 

This reverts commit 24136098.

Reason for revert: b/131637158. For some reason the Android system doesn't seem to have this permission.

Bug: 131637158

Change-Id: I7fd1e25a1bbb57f98a6ee0d07b8954c1cbcf08c2
parent 24136098

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3403,7 +3403,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 @RequiresPermission(android.Manifest.permission.READ_DEVICE_CONFIG) public boolean isProviderPackage(@NonNull String);

    method 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

+0 −1
Original line number Diff line number Diff line
@@ -2314,7 +2314,6 @@ 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

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


    @Override

    public boolean isProviderPackage(String packageName) {

        mContext.enforceCallingPermission(Manifest.permission.READ_DEVICE_CONFIG,

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

        synchronized (mLock) {

            for (LocationProvider provider : mProviders) {

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