From f81a67fa5e781728ad6dde18c97129d21616125e Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 5 Apr 2021 21:42:31 -0700 Subject: [PATCH] Fix noisy pip logs - Whenever the shelf height changes, we still call into movement bounds changed which triggers menu resize even if not in pip Bug: 183756396 Test: Open/close all apps, ensure no pip logs when not in pip Change-Id: Ia27be382316f44bb161a0f3beecd6859813d0a66 --- .../Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java | 3 +++ .../com/android/wm/shell/pip/phone/PhonePipMenuController.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index f6b63eb006ac1..e152633063bef 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -1011,6 +1011,9 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, /** Moves the PiP menu to the destination bounds. */ public void finishResizeForMenu(Rect destinationBounds) { + if (!isInPip()) { + return; + } mPipMenuController.movePipMenu(null, null, destinationBounds); mPipMenuController.updateMenuBounds(destinationBounds); } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java index 4cf8ab4768650..4f25e3c88ef60 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PhonePipMenuController.java @@ -59,7 +59,7 @@ import java.util.List; */ public class PhonePipMenuController implements PipMenuController { - private static final String TAG = "PipMenuActController"; + private static final String TAG = "PhonePipMenuController"; private static final boolean DEBUG = false; public static final int MENU_STATE_NONE = 0;