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

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

Merge "Flags instead of booleans for countPermissionApps"

parents 6bcd0ec1 a9fb1523

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

+3 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ public class AppLocationPermissionPreferenceController extends 
        PermissionControllerManager permController =

                mContext.getSystemService(PermissionControllerManager.class);

        permController.countPermissionApps(

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

                Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), 0,

                (numApps) -> {

                    mNumTotal = numApps;

                    if (loadingInProgress.decrementAndGet() == 0) {
@@ -85,7 +85,8 @@ public class AppLocationPermissionPreferenceController extends 
                }, null);



        permController.countPermissionApps(

                Collections.singletonList(ACCESS_BACKGROUND_LOCATION), true, false,

                Collections.singletonList(ACCESS_BACKGROUND_LOCATION),

                PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED,

                (numApps) -> {

                    mNumBackground = numApps;

                    if (loadingInProgress.decrementAndGet() == 0) {

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class TopLevelLocationPreferenceController extends BasePreferenceControll 
            return;

        }

        mContext.getSystemService(PermissionControllerManager.class).countPermissionApps(

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

                Arrays.asList(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), 0,

                (numApps) -> {

                    setLocationAppCount(numApps);

                }, null);