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

Commit 36a9ba67 authored by Svet Ganov's avatar Svet Ganov Committed by Android (Google) Code Review
Browse files

Merge "Fix clobbered shared user install permissions."

parents 92c9692e 37f05184

services/core/java/com/android/server/pm/PackageSettingBase.java

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ abstract class PackageSettingBase extends SettingBase { 
     */

    public void copyFrom(PackageSettingBase base) {

        setPermissionsUpdatedForUserIds(base.getPermissionsUpdatedForUserIds());

        getPermissionsState().copyFrom(base.getPermissionsState());

        mPermissionsState.copyFrom(base.mPermissionsState);

        primaryCpuAbiString = base.primaryCpuAbiString;

        secondaryCpuAbiString = base.secondaryCpuAbiString;

        cpuAbiOverrideString = base.cpuAbiOverrideString;

services/core/java/com/android/server/pm/SettingBase.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ abstract class SettingBase { 
    int pkgFlags;

    int pkgPrivateFlags;



    private final PermissionsState mPermissionsState;

    protected final PermissionsState mPermissionsState;

    private int[] mPermissionsUpdatedForUserIds = PermissionsState.USERS_NONE;



    SettingBase(int pkgFlags, int pkgPrivateFlags) {