commit a273eafec47580b3eb0f296dd10a3efb9b2adc8a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 12 18:22:12 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 12 18:22:12 2019 +0000
tree cae74da5ae4667dc52ccfb157f0345c42fe0af5e
parent 89e8e955cb5c3d9e8f7ad387e3bdba2e8292b5e7
parent a327e6a3d12d689abd5a2fa014fdfa60249eb4c7

Merge "Initializing ActivityManagerWrapper before device unlock" into ub-launcher3-qt-dev

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 f34051f..097ff46 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java
@@ -282,6 +282,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();
@@ -408,7 +409,6 @@
     }
 
     private void initWhenUserUnlocked() {
-        mAM = ActivityManagerWrapper.getInstance();
         mRecentsModel = RecentsModel.INSTANCE.get(this);
         mOverviewComponentObserver = new OverviewComponentObserver(this);