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

Commit 2a65b60e authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "RuntimePermissionPresenter was renamed to PermissionControllerManager"

parents 7eade17c 70e81da5

src/com/android/settings/location/AppLocationPermissionPreferenceController.java

+5 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import static android.Manifest.permission.ACCESS_FINE_LOCATION; 


import android.content.Context;

import android.location.LocationManager;

import android.permission.RuntimePermissionPresenter;

import android.permission.PermissionControllerManager;

import android.provider.Settings;



import androidx.preference.Preference;
@@ -70,7 +70,9 @@ public class AppLocationPermissionPreferenceController extends 
        if (!mLocationManager.isLocationEnabled()) {

            return;

        }

        RuntimePermissionPresenter.getInstance(mContext).countPermissionApps(

        PermissionControllerManager permController =

                mContext.getSystemService(PermissionControllerManager.class);

        permController.countPermissionApps(

                Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false,

                (numApps) -> {

                    mNumTotal = numApps;
@@ -79,7 +81,7 @@ public class AppLocationPermissionPreferenceController extends 
                    }

                }, null);



        RuntimePermissionPresenter.getInstance(mContext).countPermissionApps(

        permController.countPermissionApps(

                Collections.singletonList(ACCESS_BACKGROUND_LOCATION), true, false,

                (numApps) -> {

                    mNumBackground = numApps;

src/com/android/settings/location/TopLevelLocationPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.location.LocationManager;

import android.permission.RuntimePermissionPresenter;

import android.permission.PermissionControllerManager;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;
@@ -70,7 +70,7 @@ public class TopLevelLocationPreferenceController extends BasePreferenceControll 
        if (!mLocationManager.isLocationEnabled()) {

            return;

        }

        RuntimePermissionPresenter.getInstance(mContext).countPermissionApps(

        mContext.getSystemService(PermissionControllerManager.class).countPermissionApps(

                Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), false, false,

                (numApps) -> {

                    setLocationAppCount(numApps);