commit 623c9801d0f16f3f0f943e6c1d29b5df945412b9
author Ben Lin <linben@google.com> Fri Apr 02 15:05:39 2021 -0700
committer Ben Lin <linben@google.com> Fri Apr 02 15:22:19 2021 -0700
tree 57cfcb80f9104e411c3e7955d48450c2a970889d
parent 41d65a1ba0a7f2696278607b52f310f4d021949d

PiP: Null-check menu view when dispatching touch events to the menu.

Although this should not happen, it is possible that sometimes touch
events can be dispatched to the menu controller when the menu is not
around (SystemUI crash, perhaps).

Bug: 170707099
Test: None
Change-Id: I0d0c9826b10bf9071902075f0ad51051a5009d17

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

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 65f3d3a..4cf8ab4 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
@@ -526,6 +526,10 @@
      * Handles a pointer event sent from pip input consumer.
      */
     void handlePointerEvent(MotionEvent ev) {
+        if (mPipMenuView == null) {
+            return;
+        }
+
         if (ev.isTouchEvent()) {
             mPipMenuView.dispatchTouchEvent(ev);
         } else {