commit f3918002f3f6283009b9b5b6afcc8a9ffb706171
author Winson <winsonc@google.com> Tue Jan 12 15:59:29 2016 -0800
committer Winson <winsonc@google.com> Thu Jan 14 15:31:47 2016 -0800
tree 4c075584a71162bc8f0760322f4d09939013d5d7
parent d8d896cefaa694abd83bdf190c1fb3c9c34af0ac

Fixing issue with checking the docked stack state for the wrong user.

Bug: 26256285

Change-Id: I068ee8250dc75bda984092300d75031422fbbd11

packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java

diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
index e05a6f8f..01de60c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java
@@ -367,7 +367,7 @@
     }
 
     /**
-     * @return whether there are any docked tasks.
+     * @return whether there are any docked tasks for the current user.
      */
     public boolean hasDockedTask() {
         if (mIam == null) return false;
@@ -375,6 +375,9 @@
         ActivityManager.StackInfo stackInfo = null;
         try {
             stackInfo = mIam.getStackInfo(DOCKED_STACK_ID);
+            if (stackInfo != null && stackInfo.userId != getCurrentUser()) {
+                return false;
+            }
         } catch (RemoteException e) {
             e.printStackTrace();
         }