commit 0f2b44e7ab6350a3192f6498a280fe75aae787a9
author Winson Chung <winsonc@google.com> Wed Sep 03 15:34:37 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 03 15:34:37 2014 +0000
tree 75e6a22d357a6c1e2f3cb335bfd45f81dd849696
parent 2ceba249ebabdd865bba568c440b0937dffb3404
parent 67b4b2cdb429259ffffbff3f42783037b616a749

am bf5c26f5: Merge "Fixing Recents crash with non-primary user. (Bug 17343688)" into lmp-dev

* commit 'bf5c26f50b3b8dd48dcc94d4a39a5094f8494237':
  Fixing Recents crash with non-primary user. (Bug 17343688)

packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java

diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index 6cae7d4..082dde6 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -355,6 +355,8 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // For the non-primary user, ensure that the SystemSericesProxy is initialized
+        RecentsTaskLoader.initialize(this);
 
         // Initialize the loader and the configuration
         mConfig = RecentsConfiguration.reinitialize(this,