[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: ca9cc76d5e (305696a9) · Commits · e / os / android_frameworks_base

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

+33 −6

Original line number	Original line	Diff line number	Diff line
	@@ -194,6 +194,7 @@ import android.os.Handler;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.Looper;		import android.os.Looper;
	import android.os.Message;		import android.os.Message;
			import android.os.Process;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.SystemClock;		import android.os.SystemClock;
	import android.os.Trace;		import android.os.Trace;
	@@ -385,6 +386,11 @@ class Task extends WindowContainer<WindowContainer> {
	*/		*/
	boolean mInResumeTopActivity = false;		boolean mInResumeTopActivity = false;

			/**
			* Used to identify if the activity that is installed from device's system image.
			*/
			boolean mIsEffectivelySystemApp;

	int mCurrentUser;		int mCurrentUser;

	String affinity; // The affinity name for this task, or null; may change identity.		String affinity; // The affinity name for this task, or null; may change identity.
	@@ -785,11 +791,24 @@ class Task extends WindowContainer<WindowContainer> {

	if (r.finishing) return false;		if (r.finishing) return false;

			if (mRoot == null \|\| mRoot.finishing) {
	// Set this as the candidate root since it isn't finishing.		// Set this as the candidate root since it isn't finishing.
	mRoot = r;		mRoot = r;
			}

			final int uid = mRoot == r ? effectiveUid : r.info.applicationInfo.uid;
			if (ignoreRelinquishIdentity
			\|\| (mRoot.info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0
			\|\| (mRoot.info.applicationInfo.uid != Process.SYSTEM_UID
			&& !mRoot.info.applicationInfo.isSystemApp()
			&& mRoot.info.applicationInfo.uid != uid)) {
			// No need to relinquish identity, end search.
			return true;
			}

	// Only end search if we are ignore relinquishing identity or we are not relinquishing.		// Relinquish to next activity
	return ignoreRelinquishIdentity \|\| (r.info.flags & FLAG_RELINQUISH_TASK_IDENTITY) == 0;		mRoot = r;
			return false;
	}		}
	}		}

	@@ -1241,12 +1260,19 @@ class Task extends WindowContainer<WindowContainer> {
	* @param info The activity info which could be different from {@code r.info} if set.		* @param info The activity info which could be different from {@code r.info} if set.
	*/		*/
	void setIntent(ActivityRecord r, @Nullable Intent intent, @Nullable ActivityInfo info) {		void setIntent(ActivityRecord r, @Nullable Intent intent, @Nullable ActivityInfo info) {
	if (this.intent == null \|\| !mNeverRelinquishIdentity) {		boolean updateIdentity = false;
			if (this.intent == null) {
			updateIdentity = true;
			} else if (!mNeverRelinquishIdentity) {
			final ActivityInfo activityInfo = info != null ? info : r.info;
			updateIdentity = (effectiveUid == Process.SYSTEM_UID \|\| mIsEffectivelySystemApp
			\|\| effectiveUid == activityInfo.applicationInfo.uid);
			}
			if (updateIdentity) {
	mCallingUid = r.launchedFromUid;		mCallingUid = r.launchedFromUid;
	mCallingPackage = r.launchedFromPackage;		mCallingPackage = r.launchedFromPackage;
	mCallingFeatureId = r.launchedFromFeatureId;		mCallingFeatureId = r.launchedFromFeatureId;
	setIntent(intent != null ? intent : r.intent, info != null ? info : r.info);		setIntent(intent != null ? intent : r.intent, info != null ? info : r.info);
	return;
	}		}
	setLockTaskAuth(r);		setLockTaskAuth(r);
	}		}
	@@ -1264,6 +1290,7 @@ class Task extends WindowContainer<WindowContainer> {
	rootAffinity = affinity;		rootAffinity = affinity;
	}		}
	effectiveUid = info.applicationInfo.uid;		effectiveUid = info.applicationInfo.uid;
			mIsEffectivelySystemApp = info.applicationInfo.isSystemApp();
	stringName = null;		stringName = null;

	if (info.targetActivity == null) {		if (info.targetActivity == null) {

services/tests/wmtests/src/com/android/server/wm/TaskTests.java

+46 −6

Original line number	Original line	Diff line number	Diff line
	@@ -895,10 +895,10 @@ public class TaskTests extends WindowTestsBase {
	*/		*/
	@Test		@Test
	public void testFindRootIndex_effectiveRoot_finishingAndRelinquishing() {		public void testFindRootIndex_effectiveRoot_finishingAndRelinquishing() {
	final Task task = getTestTask();		final ActivityRecord activity0 = new ActivityBuilder(mAtm).setCreateTask(true).build();
			final Task task = activity0.getTask();
	// Add extra two activities. Mark the one on the bottom with "relinquishTaskIdentity" and		// Add extra two activities. Mark the one on the bottom with "relinquishTaskIdentity" and
	// one above as finishing.		// one above as finishing.
	final ActivityRecord activity0 = task.getBottomMostActivity();
	activity0.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;		activity0.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;
	final ActivityRecord activity1 = new ActivityBuilder(mAtm).setTask(task).build();		final ActivityRecord activity1 = new ActivityBuilder(mAtm).setTask(task).build();
	activity1.finishing = true;		activity1.finishing = true;
	@@ -930,9 +930,9 @@ public class TaskTests extends WindowTestsBase {
	*/		*/
	@Test		@Test
	public void testFindRootIndex_effectiveRoot_relinquishingMultipleActivities() {		public void testFindRootIndex_effectiveRoot_relinquishingMultipleActivities() {
	final Task task = getTestTask();		final ActivityRecord activity0 = new ActivityBuilder(mAtm).setCreateTask(true).build();
			final Task task = activity0.getTask();
	// Set relinquishTaskIdentity for all activities in the task		// Set relinquishTaskIdentity for all activities in the task
	final ActivityRecord activity0 = task.getBottomMostActivity();
	activity0.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;		activity0.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;
	final ActivityRecord activity1 = new ActivityBuilder(mAtm).setTask(task).build();		final ActivityRecord activity1 = new ActivityBuilder(mAtm).setTask(task).build();
	activity1.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;		activity1.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;
	@@ -1082,9 +1082,9 @@ public class TaskTests extends WindowTestsBase {
	*/		*/
	@Test		@Test
	public void testGetTaskForActivity_onlyRoot_relinquishTaskIdentity() {		public void testGetTaskForActivity_onlyRoot_relinquishTaskIdentity() {
	final Task task = getTestTask();		final ActivityRecord activity0 = new ActivityBuilder(mAtm).setCreateTask(true).build();
			final Task task = activity0.getTask();
	// Make the current root activity relinquish task identity		// Make the current root activity relinquish task identity
	final ActivityRecord activity0 = task.getBottomMostActivity();
	activity0.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;		activity0.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;
	// Add an extra activity on top - this will be the new root		// Add an extra activity on top - this will be the new root
	final ActivityRecord activity1 = new ActivityBuilder(mAtm).setTask(task).build();		final ActivityRecord activity1 = new ActivityBuilder(mAtm).setTask(task).build();
	@@ -1180,6 +1180,46 @@ public class TaskTests extends WindowTestsBase {
	verify(task).setIntent(eq(activity0));		verify(task).setIntent(eq(activity0));
	}		}

			/**
			* Test {@link Task#updateEffectiveIntent()} when activity with relinquishTaskIdentity but
			* another with different uid. This should make the task use the root activity when updating the
			* intent.
			*/
			@Test
			public void testUpdateEffectiveIntent_relinquishingWithDifferentUid() {
			final ActivityRecord activity0 = new ActivityBuilder(mAtm)
			.setActivityFlags(FLAG_RELINQUISH_TASK_IDENTITY).setCreateTask(true).build();
			final Task task = activity0.getTask();

			// Add an extra activity on top
			new ActivityBuilder(mAtm).setUid(11).setTask(task).build();

			spyOn(task);
			task.updateEffectiveIntent();
			verify(task).setIntent(eq(activity0));
			}

			/**
			* Test {@link Task#updateEffectiveIntent()} with activities set as relinquishTaskIdentity.
			* This should make the task use the topmost activity when updating the intent.
			*/
			@Test
			public void testUpdateEffectiveIntent_relinquishingMultipleActivities() {
			final ActivityRecord activity0 = new ActivityBuilder(mAtm)
			.setActivityFlags(FLAG_RELINQUISH_TASK_IDENTITY).setCreateTask(true).build();
			final Task task = activity0.getTask();
			// Add an extra activity on top
			final ActivityRecord activity1 = new ActivityBuilder(mAtm).setTask(task).build();
			activity1.info.flags \|= FLAG_RELINQUISH_TASK_IDENTITY;

			// Add an extra activity on top
			final ActivityRecord activity2 = new ActivityBuilder(mAtm).setTask(task).build();

			spyOn(task);
			task.updateEffectiveIntent();
			verify(task).setIntent(eq(activity2));
			}

	@Test		@Test
	public void testSaveLaunchingStateWhenConfigurationChanged() {		public void testSaveLaunchingStateWhenConfigurationChanged() {
	LaunchParamsPersister persister = mAtm.mTaskSupervisor.mLaunchParamsPersister;		LaunchParamsPersister persister = mAtm.mTaskSupervisor.mLaunchParamsPersister;