From c404ec620d1db4b97bd91624cd6135a77e02e919 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Tue, 8 Mar 2022 14:25:54 -0800
Subject: [PATCH] Only fire extra pause for pip-ing apps

Otherwise we end up doing an extra pause+resume for
everything.

Bug: 220196913
Test: atest ActivityLifecycleTests
Change-Id: I4d13eaba5117f60901f266ce1b29e648e532d7b7
---
 services/core/java/com/android/server/wm/Transition.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 4c23f3991c580..7f32447963341 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -491,7 +491,8 @@ class Transition extends Binder implements BLASTSyncEngine.TransactionReadyListe
                             // Avoid commit visibility to false here, or else we will get a sudden
                             // "flash" / surface going invisible for a split second.
                             commitVisibility = false;
-                        } else {
+                        } else if (ar.getDeferHidingClient()) {
+                            // Legacy PIP-enter requires pause event with user-leaving.
                             mController.mAtm.mTaskSupervisor.mUserLeaving = true;
                             ar.getTaskFragment().startPausing(false /* uiSleeping */,
                                     null /* resuming */, "finishTransition");