commit 785394eb5494171797e232d39e4c006d162b919c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue May 16 23:29:06 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 16 23:29:06 2023 +0000
tree fa63540923018e880a6b2e129d2b44c0a128e659
parent e435b1d759d488a2ea1a5aaa8b456e64aa268aa3
parent 34f9dae2d354fa81f29c24c4ec1b7f3f2ffd028e

Merge "Fix the pip bounds error when entering pip mode."

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java

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 83bc7c0..8896529 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
@@ -597,6 +597,13 @@
             return true;
         }
 
+        // Ignore the motion event When the entry animation is waiting to be started
+        if (!mTouchState.isUserInteracting() && mPipTaskOrganizer.isEntryScheduled()) {
+            ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,
+                    "%s: Waiting to start the entry animation, skip the motion event.", TAG);
+            return true;
+        }
+
         // Update the touch state
         mTouchState.onTouchEvent(ev);