From 6c41ca43d3edc54bd38c8fbd4416756d2026e7ef Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 2 Mar 2022 20:43:43 +0000
Subject: [PATCH] Add DozeSuppressor to DozeModule

Test: atest SuppressAmbientDisplayTest
Fixes: 222311247
Bug: 218509239
Change-Id: Idc1c540135f38da16f199ff2fb68bbedb4f29fd7
---
 .../android/systemui/dagger/FrameworkServicesModule.java | 8 ++++++++
 .../src/com/android/systemui/doze/dagger/DozeModule.java | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
index 71c538d9324b8..fc85a85d0acb7 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java
@@ -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) {
diff --git a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
index 32b7658b6e099..98cd2d73e4fd4 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
@@ -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
         };
     }