Merge "PiP: Recheck condition to pass input to menu." into sc-dev

2021-05-12 21:33:01 +00:00
parent c70b38a9f8 dcecbaed57
commit 8c39ee10d3
1 changed files with 1 additions and 1 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
@@ -614,7 +614,7 @@ public class PipTouchHandler {
            }
        }

-        shouldDeliverToMenu |= !mPipBoundsState.isStashed();
+        shouldDeliverToMenu &= !mPipBoundsState.isStashed();

        // Deliver the event to PipMenuActivity to handle button click if the menu has shown.
        if (shouldDeliverToMenu) {