From 09381e117ecd9f175c99a2d712f5c5158b96af8f Mon Sep 17 00:00:00 2001 From: Hongwei Wang Date: Tue, 2 Feb 2021 11:29:33 -0800 Subject: [PATCH] Ignore moveTaskToBack transition for PiP YT calls Activity#moveTaskToBack(false) when tapping on background play in PiP mode. Simply ignore any system transition in this case. See also go/pip-move-task-to-back Video: http://recall/-/aaaaaabFQoRHlzixHdtY/g1i3IAyUeSJua1dA61OhXQ Bug: 175279237 Test: Tap background play when in PiP, see Video Change-Id: I7319fe6e12208e51e516bc4ea82ee7325ccecc11 --- services/core/java/com/android/server/wm/Task.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 2a0041afd9d0d..d4f3f1e7415f6 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -7176,8 +7176,11 @@ class Task extends 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()) {