Merge "Merge "ASM - Bug fixes for clearTopIfNeeded" into udc-dev am: 628ef8cc2d am: d99bcf72f3" (2d60e13d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivitySecurityModelFeatureFlags.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ class ActivitySecurityModelFeatureFlags {
		static final String DOC_LINK = "go/android-asm";

		/** Used to determine which version of the ASM logic was used in logs while we iterate */
		static final int ASM_VERSION = 6;
		static final int ASM_VERSION = 7;

		private static final String NAMESPACE = NAMESPACE_WINDOW_MANAGER;
		private static final String KEY_ASM_PREFIX = "ActivitySecurity__";
		@@ -89,6 +89,9 @@ class ActivitySecurityModelFeatureFlags {

		if (flagEnabled) {
		String[] packageNames = sPm.getPackagesForUid(uid);
		if (packageNames == null) {
		return true;
		}
		for (int i = 0; i < packageNames.length; i++) {
		if (sExcludedPackageNames.contains(packageNames[i])) {
		return false;

+5 −4

Original line number	Diff line number	Diff line
		@@ -2269,13 +2269,14 @@ class ActivityStarter {
		*/
		private void clearTopIfNeeded(@NonNull Task targetTask, int callingUid, int realCallingUid,
		int startingUid, int launchFlags) {
		if ((launchFlags & FLAG_ACTIVITY_NEW_TASK) != FLAG_ACTIVITY_NEW_TASK) {
		// Launch is from the same task, so must be a top or privileged UID
		if ((launchFlags & FLAG_ACTIVITY_NEW_TASK) != FLAG_ACTIVITY_NEW_TASK
		\|\| mBalCode == BAL_ALLOW_ALLOWLISTED_UID) {
		// Launch is from the same task, (a top or privileged UID), or is directly privileged.
		return;
		}

		Predicate<ActivityRecord> isLaunchingOrLaunched = ar -> !ar.finishing
		&& (ar.isUid(startingUid) \|\| ar.isUid(callingUid) \|\| ar.isUid(realCallingUid));
		Predicate<ActivityRecord> isLaunchingOrLaunched = ar ->
		ar.isUid(startingUid) \|\| ar.isUid(callingUid) \|\| ar.isUid(realCallingUid);

		// Return early if we know for sure we won't need to clear any activities by just checking
		// the top activity.

+8 −2

Original line number	Diff line number	Diff line
		@@ -1666,7 +1666,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		String callerActivityClassName) {
		// We may have already checked that the callingUid has additional clearTask privileges, and
		// cleared the calling identify. If so, we infer we do not need further restrictions here.
		if (callingUid == SYSTEM_UID) {
		if (callingUid == SYSTEM_UID \|\| !task.isVisible() \|\| task.inMultiWindowMode()) {
		return;
		}

		@@ -1772,13 +1772,19 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		return new Pair<>(true, true);
		}

		// Always allow actual top activity to clear task
		ActivityRecord topActivity = task.getTopMostActivity();
		if (topActivity != null && topActivity.isUid(uid)) {
		return new Pair<>(true, true);
		}

		// Consider the source activity, whether or not it is finishing. Do not consider any other
		// finishing activity.
		Predicate<ActivityRecord> topOfStackPredicate = (ar) -> ar.equals(sourceRecord)
		\|\| (!ar.finishing && !ar.isAlwaysOnTop());

		// Check top of stack (or the first task fragment for embedding).
		ActivityRecord topActivity = task.getActivity(topOfStackPredicate);
		topActivity = task.getActivity(topOfStackPredicate);
		if (topActivity == null) {
		return new Pair<>(false, false);
		}