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

Merge "Synchronize cache-is-ready boolean with cache readiness." into tm-dev

Browse Source
This commit is contained in:
Alex Buynytskyy
2022-05-13 04:48:34 +00:00
committed by Android (Google) Code Review
parent 0ad655dd20 db9ae43ac5
commit c3c32652d2
4 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/AppsFilterBase.java
View File

@@ -173,7 +173,7 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot {
* {@link #shouldFilterApplicationInternal(PackageDataSnapshot, int, Object,
* PackageStateInternal, int)} call.
* NOTE: It can only be relied upon after the system is ready to avoid unnecessary update on
* initial scam and is empty until {@link #mSystemReady} is true.
* initial scam and is empty until {@link #mCacheReady} is true.
*/
@NonNull
@Watched
@@ -181,7 +181,7 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot {
@NonNull
protected SnapshotCache<WatchedSparseBooleanMatrix> mShouldFilterCacheSnapshot;
protected volatile boolean mSystemReady = false;
protected volatile boolean mCacheReady = false;
protected boolean isForceQueryable(int callingAppId) {
return mForceQueryable.contains(callingAppId);
@@ -312,7 +312,7 @@ public abstract class AppsFilterBase implements AppsFilterSnapshot {
|| callingAppId == targetPkgSetting.getAppId()) {
return false;
}
if (mSystemReady) { // use cache
if (mCacheReady) { // use cache
if (!shouldFilterApplicationUsingCache(callingUid,
targetPkgSetting.getAppId(),
userId)) {

23
services/core/java/com/android/server/pm/AppsFilterImpl.java
View File

@@ -404,7 +404,8 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
+ recipientUid + " -> " + visibleUid);
}
if (mSystemReady) {
// TODO(b/231528435): invalidate cache instead of locking.
if (true/*mCacheReady*/) {
synchronized (mCacheLock) {
// update the cache in a one-off manner since we've got all the information we
// need.
@@ -420,7 +421,6 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
mFeatureConfig.onSystemReady();
updateEntireShouldFilterCacheAsync(pmInternal);
mSystemReady = true;
}
/**
@@ -444,7 +444,8 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
final UserInfo[] users = snapshot.getUserInfos();
final ArraySet<String> additionalChangedPackages =
addPackageInternal(newPkgSetting, settings);
if (mSystemReady) {
// TODO(b/231528435): invalidate cache instead of locking.
if (true/*mCacheReady*/) {
synchronized (mCacheLock) {
updateShouldFilterCacheForPackage(snapshot, null, newPkgSetting,
settings, users, USER_ALL, settings.size());
@@ -586,7 +587,7 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
}
private void removeAppIdFromVisibilityCache(int appId) {
if (!mSystemReady) {
if (!mCacheReady) {
return;
}
synchronized (mCacheLock) {
@@ -661,18 +662,20 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
updateEntireShouldFilterCacheInner(snapshot, settings, usersRef[0], USER_ALL);
onChanged();
mCacheReady = true;
});
}
public void onUserCreated(PackageDataSnapshot snapshot, int newUserId) {
if (!mSystemReady) {
if (!mCacheReady) {
return;
}
updateEntireShouldFilterCache(snapshot, newUserId);
}
public void onUserDeleted(@UserIdInt int userId) {
if (!mSystemReady) {
if (!mCacheReady) {
return;
}
removeShouldFilterCacheForUser(userId);
@@ -681,7 +684,7 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
private void updateShouldFilterCacheForPackage(PackageDataSnapshot snapshot,
String packageName) {
if (!mSystemReady) {
if (!mCacheReady) {
return;
}
final ArrayMap<String, ? extends PackageStateInternal> settings =
@@ -930,7 +933,8 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
}
removeAppIdFromVisibilityCache(setting.getAppId());
if (mSystemReady && setting.hasSharedUser()) {
// TODO(b/231528435): invalidate cache instead of locking.
if (/*mCacheReady && */setting.hasSharedUser()) {
final ArraySet<? extends PackageStateInternal> sharedUserPackages =
getSharedUserPackages(setting.getSharedUserAppId(), sharedUserSettings);
for (int i = sharedUserPackages.size() - 1; i >= 0; i--) {
@@ -947,7 +951,8 @@ public final class AppsFilterImpl extends AppsFilterLocked implements Watchable,
}
}
if (mSystemReady) {
// TODO(b/231528435): invalidate cache instead of locking.
if (true/*mCacheReady*/) {
if (additionalChangedPackages != null) {
for (int index = 0; index < additionalChangedPackages.size(); index++) {
String changedPackage = additionalChangedPackages.valueAt(index);

2
services/core/java/com/android/server/pm/AppsFilterLocked.java
View File

@@ -32,7 +32,7 @@ abstract class AppsFilterLocked extends AppsFilterBase {
/**
* Guards the access for {@link AppsFilterBase#mShouldFilterCache};
*/
protected Object mCacheLock = new Object();
protected final Object mCacheLock = new Object();
@Override
protected boolean isForceQueryable(int appId) {

15
services/core/java/com/android/server/pm/AppsFilterSnapshotImpl.java
View File

@@ -17,6 +17,7 @@
package com.android.server.pm;
import com.android.server.utils.SnapshotCache;
import com.android.server.utils.WatchedSparseBooleanMatrix;
import java.util.Arrays;
@@ -49,12 +50,18 @@ public final class AppsFilterSnapshotImpl extends AppsFilterBase {
mFeatureConfig = orig.mFeatureConfig.snapshot();
mOverlayReferenceMapper = orig.mOverlayReferenceMapper;
mSystemSigningDetails = orig.mSystemSigningDetails;
synchronized (orig.mCacheLock) {
mShouldFilterCache = orig.mShouldFilterCacheSnapshot.snapshot();
mShouldFilterCacheSnapshot = new SnapshotCache.Sealed<>();
mCacheReady = orig.mCacheReady;
if (mCacheReady) {
synchronized (orig.mCacheLock) {
mShouldFilterCache = orig.mShouldFilterCacheSnapshot.snapshot();
}
} else {
// cache is not ready, use an empty cache for the snapshot
mShouldFilterCache = new WatchedSparseBooleanMatrix();
}
mShouldFilterCacheSnapshot = new SnapshotCache.Sealed<>();
mBackgroundExecutor = null;
mSystemReady = orig.mSystemReady;
}
}