Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8799372 authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Change AssistManger to use dagger's @Main Handler" into sc-v2-dev am: 65031c37 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16248700

Change-Id: I3e47c30ebb7ce8afab47177b117549b2481119c9
parents 2d20900b 65031c37

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ import com.android.keyguard.KeyguardUpdateMonitor; 
import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.assist.ui.DefaultUiController;

import com.android.systemui.assist.ui.DefaultUiController;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.model.SysUiState;

import com.android.systemui.model.SysUiState;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue;
@@ -133,12 +134,13 @@ public class AssistManager { 
            OverviewProxyService overviewProxyService,

            OverviewProxyService overviewProxyService,

            Lazy<SysUiState> sysUiState,

            Lazy<SysUiState> sysUiState,

            DefaultUiController defaultUiController,

            DefaultUiController defaultUiController,

            AssistLogger assistLogger) {

            AssistLogger assistLogger,

            @Main Handler uiHandler) {

        mContext = context;

        mContext = context;

        mDeviceProvisionedController = controller;

        mDeviceProvisionedController = controller;

        mCommandQueue = commandQueue;

        mCommandQueue = commandQueue;

        mAssistUtils = assistUtils;

        mAssistUtils = assistUtils;

        mAssistDisclosure = new AssistDisclosure(context, new Handler());

        mAssistDisclosure = new AssistDisclosure(context, uiHandler);

        mPhoneStateMonitor = phoneStateMonitor;

        mPhoneStateMonitor = phoneStateMonitor;

        mAssistLogger = assistLogger;

        mAssistLogger = assistLogger;