Merge "Ignore moveTaskToBack transition for PiP" into sc-dev

2021-04-29 16:28:40 +00:00
parent 3d121b7119 09381e117e
commit bcf4d577d1
1 changed files with 5 additions and 2 deletions
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -7177,8 +7177,11 @@ class Task extends WindowContainer<WindowContainer> {
        if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task="
                + tr.mTaskId);

-        mDisplayContent.prepareAppTransition(TRANSIT_TO_BACK);
-        mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_TO_BACK, tr);
+        // Skip the transition for pinned task.
+        if (!inPinnedWindowingMode()) {
+            mDisplayContent.prepareAppTransition(TRANSIT_TO_BACK);
+            mDisplayContent.requestTransitionAndLegacyPrepare(TRANSIT_TO_BACK, tr);
+        }
        moveToBack("moveTaskToBackLocked", tr);

        if (inPinnedWindowingMode()) {