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

Commit c156ef59 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Work around GIDs not applied to APK-in-APEX permissions on first boot."... 

Merge "Work around GIDs not applied to APK-in-APEX permissions on first boot." into main am: bcf722f0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2960182



Change-Id: I0fcbdda1653890cd5a55b4d26d9079cd80766ef5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61fc070c bcf722f0

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

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,10 @@ public final class Permission { 
        return mPermissionInfo.packageName;

    }



    public boolean isReconciled() {

        return mReconciled;

    }



    public int getType() {

        return mType;

    }

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

+4 −0
Original line number Diff line number Diff line
@@ -4047,6 +4047,10 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
                    // being uninstalled,

                    continue;

                }

                // Don't remove config permissions and lose their GIDs.

                if (bp.getType() == Permission.TYPE_CONFIG && !bp.isReconciled()) {

                    continue;

                }

                // The target package is the source of the current permission

                // Set to changed for either install or uninstall

                changed = true;