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

Commit 008f6561 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where group IDs were not being assigned during boot."

parents 7be4c08e bbfd58a0

services/java/com/android/server/PackageManagerService.java

+7 −1
Original line number Diff line number Diff line
@@ -4001,6 +4001,8 @@ class PackageManagerService extends IPackageManager.Stub { 
                            changedPermission = true;

                            gp.grantedPermissions.add(perm);

                            gp.gids = appendInts(gp.gids, bp.gids);

                        } else if (!ps.haveGids) {

                            gp.gids = appendInts(gp.gids, bp.gids);

                        }

                    } else {

                        Slog.w(TAG, "Not granting permission " + perm
@@ -4038,6 +4040,7 @@ class PackageManagerService extends IPackageManager.Stub { 
            // changed.

            ps.permissionsFixed = true;

        }

        ps.haveGids = true;

    }

    

    private final class ActivityIntentResolver
@@ -6926,6 +6929,7 @@ class PackageManagerService extends IPackageManager.Stub { 
                    pw.print("    timeStamp="); pw.println(ps.getTimeStampStr());

                    pw.print("    signatures="); pw.println(ps.signatures);

                    pw.print("    permissionsFixed="); pw.print(ps.permissionsFixed);

                            pw.print(" haveGids="); pw.println(ps.haveGids);

                    pw.print("    pkgFlags=0x"); pw.print(Integer.toHexString(ps.pkgFlags));

                            pw.print(" installStatus="); pw.print(ps.installStatus);

                            pw.print(" enabled="); pw.println(ps.enabled);
@@ -7548,6 +7552,7 @@ class PackageManagerService extends IPackageManager.Stub { 
        PackageSignatures signatures = new PackageSignatures();



        boolean permissionsFixed;

        boolean haveGids;



        /* Explicitly disabled components */

        HashSet<String> disabledComponents = new HashSet<String>(0);
@@ -7621,6 +7626,7 @@ class PackageManagerService extends IPackageManager.Stub { 
            timeStampString = base.timeStampString;

            signatures = base.signatures;

            permissionsFixed = base.permissionsFixed;

            haveGids = base.haveGids;

            disabledComponents = base.disabledComponents;

            enabledComponents = base.enabledComponents;

            enabled = base.enabled;