commit 3b38be296266f1810fd01aa23b215d990fa20254
author Winson Chung <winsonc@google.com> Wed Nov 29 20:50:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 29 20:50:00 2017 +0000
tree f9b70048bf69f1f7bc144740c933bf95370039c9
parent 374bde37b95a1312f344cdfcdda9c3b8bf731289
parent 4e11a71210bbb7df7faa885ee4795f688c521025

Merge "Fix issue with PiP callbacks not being handled" am: bdd8adb006
am: 4e11a71210

Change-Id: I0ad21e140aa10566f58acfa01fb7e4172edca0d3

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

diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
index 186de5c4..2d2869d 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -619,9 +619,7 @@
         @Override
         public void onTaskStackChanged() {
             if (DEBUG) Log.d(TAG, "onTaskStackChanged()");
-            if (!checkCurrentUserId(mContext, DEBUG)) {
-                return;
-            }
+
             if (getState() != STATE_NO_PIP) {
                 boolean hasPip = false;
 
@@ -656,9 +654,7 @@
         @Override
         public void onActivityPinned(String packageName, int userId, int taskId) {
             if (DEBUG) Log.d(TAG, "onActivityPinned()");
-            if (!checkCurrentUserId(mContext, DEBUG)) {
-                return;
-            }
+
             StackInfo stackInfo = getPinnedStackInfo();
             if (stackInfo == null) {
                 Log.w(TAG, "Cannot find pinned stack");
@@ -683,9 +679,7 @@
         @Override
         public void onPinnedActivityRestartAttempt(boolean clearedTask) {
             if (DEBUG) Log.d(TAG, "onPinnedActivityRestartAttempt()");
-            if (!checkCurrentUserId(mContext, DEBUG)) {
-                return;
-            }
+
             // If PIPed activity is launched again by Launcher or intent, make it fullscreen.
             movePipToFullscreen();
         }
@@ -693,9 +687,7 @@
         @Override
         public void onPinnedStackAnimationEnded() {
             if (DEBUG) Log.d(TAG, "onPinnedStackAnimationEnded()");
-            if (!checkCurrentUserId(mContext, DEBUG)) {
-                return;
-            }
+
             switch (getState()) {
                 case STATE_PIP_MENU:
                     showPipMenu();