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

am: a273eafec4

Change-Id: I43fe9ef614d896e771de233d29c1c172eeb92190
This commit is contained in:
Sunny Goyal
2019-06-12 11:34:22 -07:00
committed by android-build-merger
@@ -282,6 +282,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();
@@ -408,7 +409,6 @@ public class TouchInteractionService extends Service implements
}
private void initWhenUserUnlocked() {
mAM = ActivityManagerWrapper.getInstance();
mRecentsModel = RecentsModel.INSTANCE.get(this);
mOverviewComponentObserver = new OverviewComponentObserver(this);