Merge "Fix issue with PiP callbacks not being handled"

am: bdd8adb006

Change-Id: I03c0ef06309b1b7559a973e2823598031de3b182

diff --cc packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
index 186de5c,e1371e8..2d2869d
--- 1/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
--- 2/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@@ -654,11 -633,9 +652,9 @@@ public class PipManager implements Base
          }
  
          @Override
 -        public void onActivityPinned(String packageName, int taskId) {
 +        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");