Merge "Lock ComponentResolver when taking snapshot" into tm-dev

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;

        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);

                    }

                }};

    }