Merge "Don't add a dismiss target to WM if we're not in PiP." into tm-qpr-dev

2023-01-18 00:14:49 +00:00
parent 74daba5ad9 dcf8a9c0f1
commit 044fd54ee7
1 changed files with 4 additions and 2 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java
@@ -337,8 +337,10 @@ public class PipTouchHandler {
        mMotionHelper.synchronizePinnedStackBounds();
        reloadResources();

-        // Recreate the dismiss target for the new orientation.
-        mPipDismissTargetHandler.createOrUpdateDismissTarget();
+        if (mPipTaskOrganizer.isInPip()) {
+            // Recreate the dismiss target for the new orientation.
+            mPipDismissTargetHandler.createOrUpdateDismissTarget();
+        }
    }

    public void onImeVisibilityChanged(boolean imeVisible, int imeHeight) {