commit 9cdf45224d00f46ad127cb1cf928a0ca26651785
author Hongwei Wang <hwwang@google.com> Thu Sep 26 10:42:38 2019 -0700
committer Hongwei Wang <hwwang@google.com> Thu Sep 26 10:57:29 2019 -0700
tree c1894ab13477fb1a4b098d3cf35c99a7d73049c6
parent a904e8d2083f4ca1fc7f2a89f7bc745404d218f0

Closes PiP menu on device lock

Bug: 141322738
Test: Expand PiP then device lock and unlock
Change-Id: I0ffd3265e779946bc4e87dd0558ea139eb680bb3

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

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 4f2a6d8..5723afd 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 @@
     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();
     }