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

Commit 0631442d authored by Manjeet Rulhania's avatar Manjeet Rulhania Committed by Android (Google) Code Review
Browse files

Merge "Don't override user choice during OTA upgrade or pregrants" into main

parents 0cca2a37 40468fc1

services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java

+1 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,7 @@ final class DefaultPermissionGrantPolicy { 
     */

    private boolean isFixedOrUserSet(int flags) {

        return (flags & (PackageManager.FLAG_PERMISSION_USER_SET

                | PackageManager.FLAG_PERMISSION_ONE_TIME

                | PackageManager.FLAG_PERMISSION_USER_FIXED

                | PackageManager.FLAG_PERMISSION_POLICY_FIXED

                | PackageManager.FLAG_PERMISSION_SYSTEM_FIXED)) != 0;

services/permission/java/com/android/server/permission/access/permission/AppIdPermissionUpgrade.kt

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ class AppIdPermissionUpgrade(private val policy: AppIdPermissionPolicy) { 


        private const val MASK_ANY_FIXED =

            PermissionFlags.USER_SET or

                PermissionFlags.ONE_TIME or

                PermissionFlags.USER_FIXED or

                PermissionFlags.POLICY_FIXED or

                PermissionFlags.SYSTEM_FIXED