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

Commit 62328259 authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Fix incorrect PackageSetting in the SharedUserSetting" into tm-dev am: a22156f4 

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



Change-Id: If43dead287a257960909b380a4285856ab0fd7f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb901abe a22156f4

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

+19 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.pm;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.pm.ApplicationInfo;

import android.content.pm.SigningDetails;

import android.service.pm.PackageServiceDumpProto;
@@ -33,7 +34,9 @@ import com.android.server.pm.pkg.component.ComponentMutateUtils; 
import com.android.server.pm.pkg.component.ParsedProcess;

import com.android.server.pm.pkg.component.ParsedProcessImpl;

import com.android.server.utils.SnapshotCache;

import com.android.server.utils.Watchable;

import com.android.server.utils.WatchedArraySet;

import com.android.server.utils.Watcher;



import libcore.util.EmptyArray;
@@ -66,6 +69,16 @@ public final class SharedUserSetting extends SettingBase implements SharedUserAp 
    final WatchedArraySet<PackageSetting> mDisabledPackages;

    private final SnapshotCache<WatchedArraySet<PackageSetting>> mDisabledPackagesSnapshot;



    /**

     * The observer that watches for changes from array members

     */

    private final Watcher mObserver = new Watcher() {

        @Override

        public void onChange(@Nullable Watchable what) {

            SharedUserSetting.this.onChanged();

        }

    };



    final PackageSignatures signatures = new PackageSignatures();

    Boolean signaturesChanged;
@@ -97,6 +110,7 @@ public final class SharedUserSetting extends SettingBase implements SharedUserAp 
        mDisabledPackagesSnapshot = new SnapshotCache.Auto<>(mDisabledPackages, mDisabledPackages,

                "SharedUserSetting.mDisabledPackages");

        processes = new ArrayMap<>();

        registerObservers();

        mSnapshot = makeCache();

    }
@@ -119,6 +133,11 @@ public final class SharedUserSetting extends SettingBase implements SharedUserAp 
        mSnapshot = new SnapshotCache.Sealed<>();

    }



    private void registerObservers() {

        mPackages.registerObserver(mObserver);

        mDisabledPackages.registerObserver(mObserver);

    }



    /**

     * Return a read-only snapshot of this object.

     */