Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie14daec84139ec03f72384fcd46acdb085cd2d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-15 14:46:44 +00:00
committed by Automerger Merge Worker
parent ddc9925d91 715b58c274
commit 7d9c24b3d3
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/pm/resolution/ComponentResolver.java
View File

@@ -79,7 +79,8 @@ import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
/** Resolves all Android component types [activities, services, providers and receivers]. */ /** 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 boolean DEBUG = false;
private static final String TAG = "PackageManager"; private static final String TAG = "PackageManager";
private static final boolean DEBUG_FILTERS = false; private static final boolean DEBUG_FILTERS = false;
@@ -166,11 +167,13 @@ public class ComponentResolver extends ComponentResolverLocked implements Snappa
mProvidersByAuthority = new ArrayMap<>(); mProvidersByAuthority = new ArrayMap<>();
mDeferProtectedFilters = true; mDeferProtectedFilters = true;
mSnapshot = new SnapshotCache<ComponentResolverApi>(this, this) { mSnapshot = new SnapshotCache<>(this, this) {
@Override @Override
public ComponentResolverApi createSnapshot() { public ComponentResolverApi createSnapshot() {
synchronized (mLock) {
return new ComponentResolverSnapshot(ComponentResolver.this, return new ComponentResolverSnapshot(ComponentResolver.this,
userNeedsBadgingCache); userNeedsBadgingCache);
}
}}; }};
} }