From 9cdf45224d00f46ad127cb1cf928a0ca26651785 Mon Sep 17 00:00:00 2001
From: Hongwei Wang <hwwang@google.com>
Date: Thu, 26 Sep 2019 10:42:38 -0700
Subject: [PATCH] Closes PiP menu on device lock

Bug: 141322738
Test: Expand PiP then device lock and unlock
Change-Id: I0ffd3265e779946bc4e87dd0558ea139eb680bb3
---
 .../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 4f2a6d82a08ea..5723afd4ae950 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -247,6 +247,9 @@ public class PipMenuActivity extends Activity {
     protected void onStop() {
         super.onStop();
 
+        // In cases such as device lock, hide and finish it so that it can be recreated on the top
+        // next time it starts, see also {@link #onUserLeaveHint}
+        hideMenu();
         cancelDelayedFinish();
     }