Merge "Fix unable to launch app again from launcher" into sc-v2-dev am: 92047ed021

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15501965

Change-Id: If6878373ab8c1e11a6caf590db4e19e4ebe2c8a5
This commit is contained in:
Louis Chang
2021-08-10 13:18:11 +00:00
committed by Automerger Merge Worker

View File

@@ -2682,7 +2682,7 @@ class ActivityStarter {
&& mTargetRootTask != intentTask.getParent().asTask()) { && mTargetRootTask != intentTask.getParent().asTask()) {
intentTask.getParent().positionChildAt(POSITION_TOP, intentTask, intentTask.getParent().positionChildAt(POSITION_TOP, intentTask,
false /* includingParents */); false /* includingParents */);
intentTask = intentTask.getParent().asTask(); intentTask = intentTask.getParent().asTaskFragment().getTask();
} }
// If the task is in multi-windowing mode, the activity may already be on // If the task is in multi-windowing mode, the activity may already be on
// the top (visible to user but not the global top), then the result code // the top (visible to user but not the global top), then the result code