Commit 508a4c1d authored Apr 05, 2021 by Ben Lin Committed by Automerger Merge Worker Apr 05, 2021

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

Merge "PiP: Null-check menu view when dispatching touch events to the menu." into sc-dev am: 1a180247

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14077983

Change-Id: Ifd2ffe1f9ff372b1b7262cfcec5795cd0ff1b855

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -526,6 +526,10 @@ public class PhonePipMenuController implements PipMenuController {
		* Handles a pointer event sent from pip input consumer.
		*/
		void handlePointerEvent(MotionEvent ev) {
		if (mPipMenuView == null) {
		return;
		}

		if (ev.isTouchEvent()) {
		mPipMenuView.dispatchTouchEvent(ev);
		} else {