Merge "RESTRICT AUTOMERGE Revert "Construct AppsFilter cache on background... (a918ea54) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/AppsFilter.java

+69 −110

Original line number	Diff line number	Diff line
		@@ -35,9 +35,6 @@ import android.content.pm.parsing.component.ParsedInstrumentation;
		import android.content.pm.parsing.component.ParsedIntentInfo;
		import android.content.pm.parsing.component.ParsedMainComponent;
		import android.content.pm.parsing.component.ParsedProvider;
		import android.os.Handler;
		import android.os.HandlerExecutor;
		import android.os.HandlerThread;
		import android.os.Process;
		import android.os.Trace;
		import android.os.UserHandle;
		@@ -51,7 +48,6 @@ import android.util.SparseBooleanArray;
		import android.util.SparseSetArray;

		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		import com.android.server.FgThread;
		@@ -65,7 +61,6 @@ import java.util.List;
		import java.util.Objects;
		import java.util.Set;
		import java.util.StringTokenizer;
		import java.util.concurrent.Executor;

		/**
		* The entity responsible for filtering visibility between apps based on declarations in their
		@@ -100,12 +95,6 @@ public class AppsFilter {
		*/
		private final SparseSetArray<Integer> mQueriesViaComponent = new SparseSetArray<>();

		/**
		* Executor for running reasonably short background tasks such as building the initial
		* visibility cache.
		*/
		private final Executor mBackgroundExecutor;

		/**
		* Pending full recompute of mQueriesViaComponent. Occurs when a package adds a new set of
		* protected broadcast. This in turn invalidates all prior additions and require a very
		@@ -136,8 +125,6 @@ public class AppsFilter {
		private PackageParser.SigningDetails mSystemSigningDetails;
		private Set<String> mProtectedBroadcasts = new ArraySet<>();

		private final Object mCacheLock = new Object();

		/**
		* This structure maps uid -> uid and indicates whether access from the first should be
		* filtered to the second. It's essentially a cache of the
		@@ -145,7 +132,6 @@ public class AppsFilter {
		* NOTE: It can only be relied upon after the system is ready to avoid unnecessary update on
		* initial scam and is null until {@link #onSystemReady()} is called.
		*/
		@GuardedBy("mCacheLock")
		private volatile SparseArray<SparseBooleanArray> mShouldFilterCache;

		@VisibleForTesting(visibility = PRIVATE)
		@@ -153,15 +139,13 @@ public class AppsFilter {
		FeatureConfig featureConfig,
		String[] forceQueryableWhitelist,
		boolean systemAppsQueryable,
		@Nullable OverlayReferenceMapper.Provider overlayProvider,
		Executor backgroundExecutor) {
		@Nullable OverlayReferenceMapper.Provider overlayProvider) {
		mFeatureConfig = featureConfig;
		mForceQueryableByDevicePackageNames = forceQueryableWhitelist;
		mSystemAppsQueryable = systemAppsQueryable;
		mOverlayReferenceMapper = new OverlayReferenceMapper(true /deferRebuild/,
		overlayProvider);
		mStateProvider = stateProvider;
		mBackgroundExecutor = backgroundExecutor;
		}

		/**
		@@ -353,13 +337,8 @@ public class AppsFilter {
		injector.getUserManagerInternal().getUserInfos());
		}
		};
		HandlerThread appsFilterThread = new HandlerThread("appsFilter");
		appsFilterThread.start();
		Handler appsFilterHandler = new Handler(appsFilterThread.getLooper());
		Executor executor = new HandlerExecutor(appsFilterHandler);

		AppsFilter appsFilter = new AppsFilter(stateProvider, featureConfig,
		forcedQueryablePackageNames, forceSystemAppsQueryable, null, executor);
		forcedQueryablePackageNames, forceSystemAppsQueryable, null);
		featureConfig.setAppsFilter(appsFilter);
		return appsFilter;
		}
		@@ -491,10 +470,8 @@ public class AppsFilter {
		if (mImplicitlyQueryable.add(recipientUid, visibleUid) && DEBUG_LOGGING) {
		Slog.i(TAG, "implicit access granted: " + recipientUid + " -> " + visibleUid);
		}
		synchronized (mCacheLock) {
		if (mShouldFilterCache != null) {
		// update the cache in a one-off manner since we've got all the information we
		// need.
		// update the cache in a one-off manner since we've got all the information we need.
		SparseBooleanArray visibleUids = mShouldFilterCache.get(recipientUid);
		if (visibleUids == null) {
		visibleUids = new SparseBooleanArray();
		@@ -504,13 +481,18 @@ public class AppsFilter {
		}
		}
		}
		}

		public void onSystemReady() {
		mOverlayReferenceMapper.rebuildIfDeferred();
		mStateProvider.runWithState(new StateProvider.CurrentStateCallback() {
		@Override
		public void currentState(ArrayMap<String, PackageSetting> settings,
		UserInfo[] users) {
		mShouldFilterCache = new SparseArray<>(users.length * settings.size());
		}
		});
		mFeatureConfig.onSystemReady();

		updateEntireShouldFilterCacheAsync();
		mOverlayReferenceMapper.rebuildIfDeferred();
		updateEntireShouldFilterCache();
		}

		/**
		@@ -528,12 +510,10 @@ public class AppsFilter {
		}
		mStateProvider.runWithState((settings, users) -> {
		addPackageInternal(newPkgSetting, settings);
		synchronized (mCacheLock) {
		if (mShouldFilterCache != null) {
		updateShouldFilterCacheForPackage(mShouldFilterCache, null, newPkgSetting,
		settings, users, settings.size());
		updateShouldFilterCacheForPackage(
		null, newPkgSetting, settings, users, settings.size());
		} // else, rebuild entire cache when system is ready
		}
		});
		} finally {
		Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
		@@ -627,7 +607,6 @@ public class AppsFilter {
		mFeatureConfig.updatePackageState(newPkgSetting, false /removed/);
		}

		@GuardedBy("mCacheLock")
		private void removeAppIdFromVisibilityCache(int appId) {
		if (mShouldFilterCache == null) {
		return;
		@@ -646,47 +625,33 @@ public class AppsFilter {
		}
		}

		private void updateEntireShouldFilterCacheAsync() {
		mBackgroundExecutor.execute(this::updateEntireShouldFilterCache);
		}

		private void updateEntireShouldFilterCache() {
		mStateProvider.runWithState((settings, users) -> {
		SparseArray<SparseBooleanArray> cache =
		new SparseArray<>(users.length * settings.size());
		mShouldFilterCache.clear();
		for (int i = settings.size() - 1; i >= 0; i--) {
		updateShouldFilterCacheForPackage(cache,
		updateShouldFilterCacheForPackage(
		null /skipPackage/, settings.valueAt(i), settings, users, i);
		}
		synchronized (mCacheLock) {
		mShouldFilterCache = cache;
		}
		});
		}

		public void onUsersChanged() {
		synchronized (mCacheLock) {
		if (mShouldFilterCache != null) {
		updateEntireShouldFilterCache();
		}
		}
		}

		private void updateShouldFilterCacheForPackage(String packageName) {
		synchronized (mCacheLock) {
		if (mShouldFilterCache != null) {
		mStateProvider.runWithState((settings, users) -> {
		updateShouldFilterCacheForPackage(mShouldFilterCache, null /* skipPackage */,
		settings.get(packageName), settings, users,
		settings.size() /maxIndex/);
		updateShouldFilterCacheForPackage(null /* skipPackage */, settings.get(packageName),
		settings, users, settings.size() /maxIndex/);
		});
		}
		}

		}

		private void updateShouldFilterCacheForPackage(SparseArray<SparseBooleanArray> cache,
		@Nullable String skipPackageName, PackageSetting subjectSetting, ArrayMap<String,
		PackageSetting> allSettings, UserInfo[] allUsers, int maxIndex) {
		private void updateShouldFilterCacheForPackage(@Nullable String skipPackageName,
		PackageSetting subjectSetting, ArrayMap<String, PackageSetting> allSettings,
		UserInfo[] allUsers, int maxIndex) {
		for (int i = Math.min(maxIndex, allSettings.size() - 1); i >= 0; i--) {
		PackageSetting otherSetting = allSettings.valueAt(i);
		if (subjectSetting.appId == otherSetting.appId) {
		@@ -703,17 +668,17 @@ public class AppsFilter {
		for (int ou = 0; ou < userCount; ou++) {
		int otherUser = allUsers[ou].id;
		int subjectUid = UserHandle.getUid(subjectUser, subjectSetting.appId);
		if (!cache.contains(subjectUid)) {
		cache.put(subjectUid, new SparseBooleanArray(appxUidCount));
		if (!mShouldFilterCache.contains(subjectUid)) {
		mShouldFilterCache.put(subjectUid, new SparseBooleanArray(appxUidCount));
		}
		int otherUid = UserHandle.getUid(otherUser, otherSetting.appId);
		if (!cache.contains(otherUid)) {
		cache.put(otherUid, new SparseBooleanArray(appxUidCount));
		if (!mShouldFilterCache.contains(otherUid)) {
		mShouldFilterCache.put(otherUid, new SparseBooleanArray(appxUidCount));
		}
		cache.get(subjectUid).put(otherUid,
		mShouldFilterCache.get(subjectUid).put(otherUid,
		shouldFilterApplicationInternal(
		subjectUid, subjectSetting, otherSetting, otherUser));
		cache.get(otherUid).put(subjectUid,
		mShouldFilterCache.get(otherUid).put(subjectUid,
		shouldFilterApplicationInternal(
		otherUid, otherSetting, subjectSetting, subjectUser));
		}
		@@ -747,8 +712,7 @@ public class AppsFilter {
		* This method recomputes all component / intent-based visibility and is intended to match the
		* relevant logic of {@link #addPackageInternal(PackageSetting, ArrayMap)}
		*/
		private void recomputeComponentVisibility(
		ArrayMap<String, PackageSetting> existingSettings) {
		private void recomputeComponentVisibility(ArrayMap<String, PackageSetting> existingSettings) {
		mQueriesViaComponent.clear();
		for (int i = existingSettings.size() - 1; i >= 0; i--) {
		PackageSetting setting = existingSettings.valueAt(i);
		@@ -890,7 +854,6 @@ public class AppsFilter {
		}
		}

		synchronized (mCacheLock) {
		removeAppIdFromVisibilityCache(setting.appId);
		if (mShouldFilterCache != null && setting.sharedUser != null) {
		for (int i = setting.sharedUser.packages.size() - 1; i >= 0; i--) {
		@@ -898,9 +861,8 @@ public class AppsFilter {
		if (siblingSetting == setting) {
		continue;
		}
		updateShouldFilterCacheForPackage(mShouldFilterCache, setting.name,
		siblingSetting, settings, users, settings.size());
		}
		updateShouldFilterCacheForPackage(
		setting.name, siblingSetting, settings, users, settings.size());
		}
		}
		});
		@@ -926,13 +888,11 @@ public class AppsFilter {
		\|\| callingAppId == targetPkgSetting.appId) {
		return false;
		}
		synchronized (mCacheLock) {
		if (mShouldFilterCache != null) { // use cache
		SparseBooleanArray shouldFilterTargets = mShouldFilterCache.get(callingUid);
		final int targetUid = UserHandle.getUid(userId, targetPkgSetting.appId);
		if (shouldFilterTargets == null) {
		Slog.wtf(TAG, "Encountered calling uid with no cached rules: "
		+ callingUid);
		Slog.wtf(TAG, "Encountered calling uid with no cached rules: " + callingUid);
		return true;
		}
		int indexOfTargetUid = shouldFilterTargets.indexOfKey(targetUid);
		@@ -950,7 +910,6 @@ public class AppsFilter {
		return false;
		}
		}
		}
		if (DEBUG_LOGGING \|\| mFeatureConfig.isLoggingEnabled(callingAppId)) {
		log(callingSetting, targetPkgSetting, "BLOCKED");
		}

services/core/java/com/android/server/pm/PackageManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21446,6 +21446,8 @@ public class PackageManagerService extends IPackageManager.Stub
		.getUriFor(Secure.INSTANT_APPS_ENABLED), false, co, UserHandle.USER_ALL);
		co.onChange(true);

		mAppsFilter.onSystemReady();

		// Disable any carrier apps. We do this very early in boot to prevent the apps from being
		// disabled after already being started.
		CarrierAppUtils.disableCarrierAppsUntilPrivileged(
		@@ -21594,8 +21596,6 @@ public class PackageManagerService extends IPackageManager.Stub
		mInstallerService.restoreAndApplyStagedSessionIfNeeded();

		mExistingPackages = null;

		mAppsFilter.onSystemReady();
		}

		public void waitForAppDataPrepared() {

services/tests/servicestests/src/com/android/server/pm/AppsFilterTest.java

+29 −62

File changed.

Preview size limit exceeded, changes collapsed.