commit e8190044aaa28c86b8a82fda5423498a30d5b4ee
author Hongwei Wang <hwwang@google.com> Tue Jun 03 16:43:02 2025 -0700
committer Hongwei Wang <hwwang@google.com> Wed Jun 04 11:12:42 2025 -0700
tree 62eb6da2be77258d0610acfad6dd520467095d72
parent e965da6ac0fe42e8a32c7e18a318fb4c4f762c56

Additional log for disable_gesture_pip_animating

Add additional log statements whenever disable_gesture_pip_animating
change is commited from WMShell to Launcher, to help investigate the bug

Changed also that: commitUpdate(int displayId) is deprecated, replaced
by commitUpdate()

Flag: EXEMPT bugfix
Bug: 421930052
Test: m -j SystemUIGoogle
Change-Id: If209146e2d8cfcf29c183f3cf287ccecb90589d4

packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java

diff --git a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
index 88c3def..1dbc46d 100644
--- a/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
+++ b/packages/SystemUI/src/com/android/systemui/wmshell/WMShell.java
@@ -105,7 +105,7 @@
 public final class WMShell implements
         CoreStartable,
         CommandQueue.Callbacks {
-    private static final String TAG = WMShell.class.getName();
+    private static final String TAG = WMShell.class.getSimpleName();
     private static final long INVALID_SYSUI_STATE_MASK =
             SYSUI_STATE_DIALOG_SHOWING
                     | SYSUI_STATE_STATUS_BAR_KEYGUARD_SHOWING
@@ -287,14 +287,16 @@
                 new PipTransitionController.PipTransitionCallback() {
                     @Override
                     public void onPipTransitionStarted(int direction, Rect pipBounds) {
+                        Log.d(TAG, "Set disable_gesture_pip_animating on transition start");
                         mSysUiState.setFlag(SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING, true)
-                                .commitUpdate(mDisplayTracker.getDefaultDisplayId());
+                                .commitUpdate();
                     }
 
                     @Override
                     public void onPipTransitionFinished(int direction) {
+                        Log.d(TAG, "Reset disable_gesture_pip_animating on transition finish");
                         mSysUiState.setFlag(SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING, false)
-                                .commitUpdate(mDisplayTracker.getDefaultDisplayId());
+                                .commitUpdate();
                     }
 
                     @Override
@@ -304,8 +306,9 @@
                 }, mSysUiMainExecutor);
         pip.addOnIsInPipStateChangedListener((isInPip) -> {
             if (!isInPip) {
+                Log.d(TAG, "Reset disable_gesture_pip_animating on pip exit");
                 mSysUiState.setFlag(SYSUI_STATE_DISABLE_GESTURE_PIP_ANIMATING, false)
-                        .commitUpdate(mDisplayTracker.getDefaultDisplayId());
+                        .commitUpdate();
             }
         });
         mSysUiState.addCallback((sysUiStateFlag, displayId) -> {