Commit 2895f104 authored Aug 07, 2024 by Louis Chang

Remove the empty Task when failed starting it from Recents

The recent task was restored and added to WM hierarchy for the
activity launch. However, the activity launch was aborted, which
leaves an empty Task in the WM.

Remove the Task if there's no child and should be removed when empty.
Note that the Task would also be removed from the Recents because
the Task hasn't been visible, see Task#shouldAutoRemoveFromRecents.

Bug: 357967390
Test: repro steps on the bug
Flag: EXEMPT bugfix
Change-Id: If1e4b924fa0c5dc47209be1e08e8409ed3a0b056

parent 78297ef2

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -2839,6 +2839,11 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		} finally {
		SaferIntentUtils.DISABLE_ENFORCE_INTENTS_TO_MATCH_INTENT_FILTERS.set(false);
		synchronized (mService.mGlobalLock) {
		// Remove the empty task in case the activity was failed to be launched on the
		// task that was restored from Recents.
		if (!task.hasChild() && task.shouldRemoveSelfOnLastChildRemoval()) {
		task.removeIfPossible("start-from-recents");
		}
		mService.continueWindowLayout();
		}
		}