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

Commit bcf722f0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 407ba05c ef965cfa

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
@@ -4137,6 +4137,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;