Merge "Closes PiP menu on device lock"

2019-09-26 19:33:44 +00:00
parent e02f88bc2b 9cdf45224d
commit f4717a5990
1 changed files with 3 additions and 0 deletions
--- 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();
    }