From 0c7592ffacd21c52f2fb30313b56dd9b5e9bf6f4 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Mon, 6 Feb 2017 09:04:07 -0800 Subject: [PATCH] Fixing crash when fetching SysUI components for secondary user. Bug: 35028456 Test: Manual, launch the secondary user and try to enter recents. Change-Id: I16c21b0f8222f885070550c25615be6b5dfa5b4c --- .../SystemUI/src/com/android/systemui/SystemUIApplication.java | 1 + packages/SystemUI/src/com/android/systemui/recents/Recents.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java index a9ac2d97903b8..27070edc73e59 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java @@ -87,6 +87,7 @@ public class SystemUIApplication extends Application implements SysUiServiceProv * above. */ private final Class[] SERVICES_PER_USER = new Class[] { + Dependency.class, Recents.class, PipUI.class }; diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index 9157e3377dd95..e635162807e27 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -205,7 +205,6 @@ public class Recents extends SystemUI sTaskLoader = new RecentsTaskLoader(mContext); sConfiguration = new RecentsConfiguration(mContext); mHandler = new Handler(); - getComponent(CommandQueue.class).addCallbacks(this); UiModeManager uiModeManager = (UiModeManager) mContext. getSystemService(Context.UI_MODE_SERVICE); if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) { @@ -234,6 +233,7 @@ public class Recents extends SystemUI if (sSystemServicesProxy.isSystemUser(processUser)) { // For the system user, initialize an instance of the interface that we can pass to the // secondary user + getComponent(CommandQueue.class).addCallbacks(this); mSystemToUserCallbacks = new RecentsSystemUser(mContext, mImpl); } else { // For the secondary user, bind to the primary user's service to get a persistent