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

Lock ComponentResolver when taking snapshot

Browse Source 
Otherwise it's possible to hit a concurrent modification exception
when the data structures are edited while a snapshot is being taken.

Bug: 229326910

Test: presubmit

Change-Id: Ib15551a5096c47f5a238863466af08a4a88f82b9
This commit is contained in:
Winson
2022-04-14 18:46:20 -07:00
parent b121b54fb4
commit 09d24aba05
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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;
/** 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() {
return new ComponentResolverSnapshot(ComponentResolver.this,
userNeedsBadgingCache);
synchronized (mLock) {
return new ComponentResolverSnapshot(ComponentResolver.this,
userNeedsBadgingCache);
}
}};
}