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

Commit f0545c1e authored by Yi-an Chen's avatar Yi-an Chen Committed by Android (Google) Code Review
Browse files

Merge "Prevent some key system applications from losing storage permissions" into main

parents 5736dd46 462c1d1f

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

+4 −1
Original line number Diff line number Diff line
@@ -678,8 +678,11 @@ class AppIdPermissionPolicy : SchemePolicy() { 
            newState.userStates.forEachIndexed { _, userId, userState ->

                userState.appIdPermissionFlags[appId]?.forEachReversedIndexed {

                    _, permissionName, oldFlags ->

                    // Do not revoke the permission during an upgrade if it's POLICY_FIXED or

                    // SYSTEM_FIXED. Otherwise the user cannot grant back the permission.

                    if (permissionName in STORAGE_AND_MEDIA_PERMISSIONS &&

                        oldFlags.hasBits(PermissionFlags.RUNTIME_GRANTED)) {

                        oldFlags.hasBits(PermissionFlags.RUNTIME_GRANTED) &&

                        !oldFlags.hasAnyBit(SYSTEM_OR_POLICY_FIXED_MASK)) {

                        Slog.v(

                            LOG_TAG, "Revoking storage permission: $permissionName for appId: " +

                                " $appId and user: $userId"