From dcecbaed5783d8f8c50592131d10cb011f664c67 Mon Sep 17 00:00:00 2001
From: Ben Lin <linben@google.com>
Date: Tue, 11 May 2021 16:23:40 -0700
Subject: [PATCH] PiP: Recheck condition to pass input to menu.

This used to be OR (pip is not stashed), but it should be AND.

Bug: 186499713
Test: Double tap on where the play button should be even when the menu
is not visible, no longer pauses

Change-Id: If8e101286ddfbb83caf0d6a85a1089e6c257f996
---
 .../src/com/android/wm/shell/pip/phone/PipTouchHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
index 0a0798ef24c12..9f9f1729ce6e7 100644
--- 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) {