commit 9ae4a083d8bd2d771bc7fe4c1aca956d6dbecc4b
author Daichi Hirono <hirono@google.com> Fri Feb 26 07:21:22 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 26 07:21:24 2016 +0000
tree 60ef612fef6126993c9b443fea7e67c9d1ced608
parent 07097610207d90d792d31902e711e522c1d1bbec
parent 0f32537e40ee2662d4f0b7b625ee280ca9c02066

Merge "Stops performing operations that does not supported by MTP device." into nyc-dev

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

diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
index 4171dbc..a392bec 100644
--- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java
@@ -93,6 +93,17 @@
         });
     }
 
+    private void restorePipAndFinish() {
+        mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
+        finish();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        restorePipAndFinish();
+    }
+
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -103,8 +114,7 @@
 
     @Override
     public void onBackPressed() {
-        mPipManager.resizePinnedStack(PipManager.STATE_PIP_OVERLAY);
-        finish();
+        restorePipAndFinish();
     }
 
     @Override