commit a327e6a3d12d689abd5a2fa014fdfa60249eb4c7
author Sunny Goyal <sunnygoyal@google.com> Wed Jun 12 07:41:14 2019 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Jun 12 07:41:50 2019 -0700
tree a51e6d869adde0f90749867d583b376d36192783
parent c1fa3abd2e441d4acfdf6ca8d3ba628776f2ba6d

Initializing ActivityManagerWrapper before device unlock

Bug: 134406364
Change-Id: I30339c3790efeaa60db7ea3cbae76d97474c16cc

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
index 30178a6..a952db9 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -278,6 +278,7 @@
         // Everything else should be initialized in initWhenUserUnlocked() below.
         mKM = getSystemService(KeyguardManager.class);
         mMainChoreographer = Choreographer.getInstance();
+        mAM = ActivityManagerWrapper.getInstance();
 
         if (UserManagerCompat.getInstance(this).isUserUnlocked(Process.myUserHandle())) {
             initWhenUserUnlocked();
@@ -404,7 +405,6 @@
     }
 
     private void initWhenUserUnlocked() {
-        mAM = ActivityManagerWrapper.getInstance();
         mRecentsModel = RecentsModel.INSTANCE.get(this);
         mOverviewComponentObserver = new OverviewComponentObserver(this);