From 437c2aab950a865b1037e24a33c17757c2ca91e0 Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Wed, 4 Aug 2021 17:54:38 +0800 Subject: [PATCH] Fix unable to launch app again from launcher The parent of an embedded Task is a TaskFragment. So, the intentTask was set to null and failed to bring it to front. Bug: 195911375 Test: start app with embedded task again from launcher Change-Id: Id01cb689a3637d7f49c3806f45ffd872035c58ad --- services/core/java/com/android/server/wm/ActivityStarter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index c9f3356180138..3bc6435ae0179 100644 --- 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