From 7d88c134ef91a86c4008e026ee89ba50c2b88e14 Mon Sep 17 00:00:00 2001
From: Alex Lau <alexlau@google.com>
Date: Fri, 7 Dec 2018 14:22:37 +0900
Subject: [PATCH] Reset PIP menu touch state on touch up or cancel.

Bug: 111221009
Test: build
Change-Id: Icfb90a412e58426bb246bfcf0b79c2428a6ed99a
---
 .../src/com/android/systemui/pip/phone/PipMenuActivity.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
index 8495fd38b5d44..86ce60d181142 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -224,6 +224,9 @@ public class PipMenuActivity extends Activity {
                         // next tap
                         mTouchState.scheduleDoubleTapTimeoutCallback();
                     }
+                    // Fall through
+                case MotionEvent.ACTION_CANCEL:
+                    mTouchState.reset();
                     break;
             }
             return true;