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

Commit 40468fc1 authored by mrulhania's avatar mrulhania
Browse files

Don't override user choice during OTA upgrade or pregrants 

Some permissions may be granted to an app during OTA
upgrade for compatibility reasons. We don't grant a
permission if the permission was denied by the
user, ask every time should also be treated similarly.
OTA permission upgrade flow shouldn't override/grant
the permission if user has selected ask every time.

Test: presubmit
Bug: 375500721
FLAG: EXEMPT bug fix
Change-Id: I1d7d14bcb982695f28164c0ce03b4a2dbb3e04a6
parent e62e7c83

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