Merge "Fix unable to launch app again from launcher" into sc-v2-dev

2021-08-10 13:06:05 +00:00
parent b37ecaa4dc 437c2aab95
commit 92047ed021
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -2682,7 +2682,7 @@ class ActivityStarter {
                            && mTargetRootTask != intentTask.getParent().asTask()) {
                        intentTask.getParent().positionChildAt(POSITION_TOP, intentTask,
                                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
                    // the top (visible to user but not the global top), then the result code