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

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

Merge "Do not mark user_set on one-time" into rvc-dev

parents 94ba6093 95717890

src/com/android/permissioncontroller/permission/service/PermissionControllerServiceImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -663,6 +663,7 @@ public final class PermissionControllerServiceImpl extends PermissionControllerL 
                logOneTimeSessionRevoke(packageName, uid, group, requestId);

                group.revokeRuntimePermissions(false);

            }

            group.setUserSet(false);

            group.persistChanges(false);

        }

    }

src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt

+3 −2
Original line number Diff line number Diff line
@@ -623,7 +623,8 @@ object KotlinUtils { 
        // Take a note that the user fixed the permission, if applicable.

        newFlags = if (userFixed) newFlags.setFlag(PackageManager.FLAG_PERMISSION_USER_FIXED)

        else newFlags.clearFlag(PackageManager.FLAG_PERMISSION_USER_FIXED)

        newFlags = newFlags.setFlag(PackageManager.FLAG_PERMISSION_USER_SET)

        newFlags = if (oneTime) newFlags.clearFlag(PackageManager.FLAG_PERMISSION_USER_SET)

        else newFlags.setFlag(PackageManager.FLAG_PERMISSION_USER_SET)

        newFlags = if (oneTime) newFlags.setFlag(PackageManager.FLAG_PERMISSION_ONE_TIME)

        else newFlags.clearFlag(PackageManager.FLAG_PERMISSION_ONE_TIME)