Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I3e47c30ebb7ce8afab47177b117549b2481119c9
This commit is contained in:
Matt Casey
2021-11-16 20:59:17 +00:00
committed by Automerger Merge Worker
parent 2d20900b33 65031c3762
commit e87993721e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
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;