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

This commit is contained in:
Matt Casey
2021-11-16 20:55:16 +00:00
committed by Android (Google) Code Review

View File

@@ -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;