From 0d4cbebd0f330a8a8c0ffb2b959e4c5e4f50868c Mon Sep 17 00:00:00 2001
From: Joshua Tsuji <tsuji@google.com>
Date: Fri, 1 May 2020 12:45:41 -0400
Subject: [PATCH] Only notify the floating coordinator of new bounds if we're
 in PIP.

Fixes: 155389015
Test: manual, set breakpoint and observe onContentMoved is not called on config change if we're not in PIP.
Change-Id: Ic2066ed8c005149be6c568a710d2f0c98fa15f52
---
 .../src/com/android/systemui/pip/PipTaskOrganizer.java       | 4 ++++
 .../src/com/android/systemui/pip/phone/PipMotionHelper.java  | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
index 7295f327d47a9..295cd6e49dd7f 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
@@ -213,6 +213,10 @@ public class PipTaskOrganizer extends TaskOrganizer {
         return new Rect(mLastReportedBounds);
     }
 
+    public boolean isInPip() {
+        return mInPip;
+    }
+
     /**
      * Registers {@link PipTransitionCallback} to receive transition callbacks.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
index 00f693de8f4db..b1e4d67585453 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMotionHelper.java
@@ -168,7 +168,10 @@ public class PipMotionHelper implements PipAppOpsListener.Callback,
     void synchronizePinnedStackBounds() {
         cancelAnimations();
         mBounds.set(mPipTaskOrganizer.getLastReportedBounds());
-        mFloatingContentCoordinator.onContentMoved(this);
+
+        if (mPipTaskOrganizer.isInPip()) {
+            mFloatingContentCoordinator.onContentMoved(this);
+        }
     }
 
     /**