From a327e6a3d12d689abd5a2fa014fdfa60249eb4c7 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 12 Jun 2019 07:41:14 -0700
Subject: [PATCH] Initializing ActivityManagerWrapper before device unlock

Bug: 134406364
Change-Id: I30339c3790efeaa60db7ea3cbae76d97474c16cc
---
 .../src/com/android/quickstep/TouchInteractionService.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 30178a685a..a952db94ec 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 @@ public class TouchInteractionService extends Service implements
         // 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 @@ public class TouchInteractionService extends Service implements
     }
 
     private void initWhenUserUnlocked() {
-        mAM = ActivityManagerWrapper.getInstance();
         mRecentsModel = RecentsModel.INSTANCE.get(this);
         mOverviewComponentObserver = new OverviewComponentObserver(this);