From 3caecf86ce050b3709b688ec85343c25e2e9011b Mon Sep 17 00:00:00 2001 From: Louis Chang Date: Tue, 30 Aug 2022 01:38:36 +0000 Subject: [PATCH] Clear mAddingToTaskFragment when ActivityStarter is reset Or the next launching activity could still be added to the TaskFragment. Bug: 244102039 Test: steps on the bug Change-Id: I85c40a2e81ce25d305a3757c9dcc22c657765d72 --- services/core/java/com/android/server/wm/ActivityStarter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java index f9e59c87a67f0..fedbe5bcd8627 100644 --- a/services/core/java/com/android/server/wm/ActivityStarter.java +++ b/services/core/java/com/android/server/wm/ActivityStarter.java @@ -2454,6 +2454,7 @@ class ActivityStarter { mInTask = null; mInTaskFragment = null; + mAddingToTaskFragment = null; mAddingToTask = false; mNewTaskInfo = null;