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

Commit 3caf174d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Lock ComponentResolver when taking snapshot" into tm-dev am: 715b58c2 

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



Change-Id: I17a9c1e127ece4787177bf4d2dccad416192c627
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f14dc834 715b58c2

services/core/java/com/android/server/pm/resolution/ComponentResolver.java

+7 −4
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ import java.util.Set; 
import java.util.function.Function;



/** Resolves all Android component types [activities, services, providers and receivers]. */

public class ComponentResolver extends ComponentResolverLocked implements Snappable {

public class ComponentResolver extends ComponentResolverLocked implements

        Snappable<ComponentResolverApi> {

    private static final boolean DEBUG = false;

    private static final String TAG = "PackageManager";

    private static final boolean DEBUG_FILTERS = false;
@@ -166,11 +167,13 @@ public class ComponentResolver extends ComponentResolverLocked implements Snappa 
        mProvidersByAuthority = new ArrayMap<>();

        mDeferProtectedFilters = true;



        mSnapshot = new SnapshotCache<ComponentResolverApi>(this, this) {

        mSnapshot = new SnapshotCache<>(this, this) {

                @Override

                public ComponentResolverApi createSnapshot() {

                    synchronized (mLock) {

                        return new ComponentResolverSnapshot(ComponentResolver.this,

                                userNeedsBadgingCache);

                    }

                }};

    }