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

Add DozeSuppressor to DozeModule

Browse Source 
Test: atest SuppressAmbientDisplayTest
Fixes: 222311247
Bug: 218509239
Change-Id: Idc1c540135f38da16f199ff2fb68bbedb4f29fd7
This commit is contained in:
Beverly
2022-03-02 20:43:43 +00:00
parent 2773ac9c72
commit 6c41ca43d3
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
View File

@@ -26,6 +26,7 @@ import android.app.IWallpaperManager;
import android.app.KeyguardManager;
import android.app.NotificationManager;
import android.app.StatsManager;
import android.app.UiModeManager;
import android.app.WallpaperManager;
import android.app.admin.DevicePolicyManager;
import android.app.role.RoleManager;
@@ -331,6 +332,13 @@ public class FrameworkServicesModule {
return context.getSystemService(PowerManager.class);
}
/** */
@Provides
@Singleton
static UiModeManager provideUiModeManager(Context context) {
return context.getSystemService(UiModeManager.class);
}
@Provides
@Main
static Resources provideResources(Context context) {

9
packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
View File

@@ -33,6 +33,7 @@ import com.android.systemui.doze.DozeScreenBrightness;
import com.android.systemui.doze.DozeScreenState;
import com.android.systemui.doze.DozeScreenStatePreventingAdapter;
import com.android.systemui.doze.DozeSensors;
import com.android.systemui.doze.DozeSuppressor;
import com.android.systemui.doze.DozeSuspendScreenStatePreventingAdapter;
import com.android.systemui.doze.DozeTriggers;
import com.android.systemui.doze.DozeUi;
@@ -77,11 +78,12 @@ public abstract class DozeModule {
}
@Provides
static DozeMachine.Part[] providesDozeMachinePartes(DozePauser dozePauser,
static DozeMachine.Part[] providesDozeMachineParts(DozePauser dozePauser,
DozeFalsingManagerAdapter dozeFalsingManagerAdapter, DozeTriggers dozeTriggers,
DozeUi dozeUi, DozeScreenState dozeScreenState,
DozeScreenBrightness dozeScreenBrightness, DozeWallpaperState dozeWallpaperState,
DozeDockHandler dozeDockHandler, DozeAuthRemover dozeAuthRemover) {
DozeDockHandler dozeDockHandler, DozeAuthRemover dozeAuthRemover,
DozeSuppressor dozeSuppressor) {
return new DozeMachine.Part[]{
dozePauser,
dozeFalsingManagerAdapter,
@@ -91,7 +93,8 @@ public abstract class DozeModule {
dozeScreenBrightness,
dozeWallpaperState,
dozeDockHandler,
dozeAuthRemover
dozeAuthRemover,
dozeSuppressor
};
}