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

Commit a9ac94bd authored by Evan Severson's avatar Evan Severson Committed by Android (Google) Code Review
Browse files

Merge "Cancel one-time if permission is changed in settings"

parents c9a1bb62 69187e36

src/com/android/permissioncontroller/permission/model/AppPermissionGroup.java

+3 −1
Original line number Diff line number Diff line
@@ -1149,8 +1149,10 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> 
        final int permissionCount = mPermissions.size();

        for (int i = 0; i < permissionCount; i++) {

            Permission permission = mPermissions.valueAt(i);

            if (!permission.isBackgroundPermission()) {

                permission.setOneTime(isOneTime);

            }

        }



        if (!mDelayChanges) {

            persistChanges(false);

src/com/android/permissioncontroller/permission/ui/handheld/AppPermissionViewModel.kt

+2 −0
Original line number Diff line number Diff line
@@ -384,6 +384,8 @@ class AppPermissionViewModel( 
        val context = fragment.context ?: return

        val group = appPermissionGroup ?: return



        group.isOneTime = false



        if (LocationUtils.isLocationGroupAndProvider(context, group.name,

                group.app.packageName)) {

            val packageLabel = KotlinUtils.getPackageLabel(app, packageName, user)

src/com/android/permissioncontroller/permission/utils/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ public final class Utils { 
        }

        for (String permissionName : permissions) {

            if ((pm.getPermissionFlags(permissionName, packageName, Process.myUserHandle())

                    | PackageManager.FLAG_PERMISSION_ONE_TIME) != 0) {

                    & PackageManager.FLAG_PERMISSION_ONE_TIME) != 0) {

                return true;

            }

        }