From 09ca8a218c985983a6f0f2a41ef2ce5afbd48390 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Mon, 16 May 2022 08:16:55 +0000 Subject: [PATCH] Fix not callback onTaskMovedToFront when dismissing split After I5dac8826e, launcher relies on onTaskMovedToFront to track the top most task. But in wm-core, it doesn't invoke onTaskMovedToFront when reparenting a leaf task to TaskDisplayArea, like when dismissing split screen. This makes sure to cover such flow. Fix: 229828519 Test: dismiss focused split side, enter overview, observed app icon is correct. Change-Id: Iaf420c8c7d80d3c80b2eeca31cad8718e541d8a1 --- services/core/java/com/android/server/wm/Task.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 60c280cb61f9c..816f48ac923ab 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -5997,6 +5997,9 @@ class Task extends TaskFragment { if (canBeLaunchedOnDisplay(newParent.getDisplayId())) { reparent(newParent, onTop ? POSITION_TOP : POSITION_BOTTOM); + if (isLeafTask()) { + newParent.onLeafTaskMoved(this, onTop); + } } else { Slog.w(TAG, "Task=" + this + " can't reparent to " + newParent); }