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

Merge "Add DozeSuppressor to DozeModule" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-03 14:45:24 +00:00
committed by Android (Google) Code Review
parent c4c1ac53fd 6c41ca43d3
commit 01eeccd8fe
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.KeyguardManager;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.StatsManager; import android.app.StatsManager;
import android.app.UiModeManager;
import android.app.WallpaperManager; import android.app.WallpaperManager;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.role.RoleManager; import android.app.role.RoleManager;
@@ -331,6 +332,13 @@ public class FrameworkServicesModule {
return context.getSystemService(PowerManager.class); return context.getSystemService(PowerManager.class);
} }
/** */
@Provides
@Singleton
static UiModeManager provideUiModeManager(Context context) {
return context.getSystemService(UiModeManager.class);
}
@Provides @Provides
@Main @Main
static Resources provideResources(Context context) { 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.DozeScreenState;
import com.android.systemui.doze.DozeScreenStatePreventingAdapter; import com.android.systemui.doze.DozeScreenStatePreventingAdapter;
import com.android.systemui.doze.DozeSensors; import com.android.systemui.doze.DozeSensors;
import com.android.systemui.doze.DozeSuppressor;
import com.android.systemui.doze.DozeSuspendScreenStatePreventingAdapter; import com.android.systemui.doze.DozeSuspendScreenStatePreventingAdapter;
import com.android.systemui.doze.DozeTriggers; import com.android.systemui.doze.DozeTriggers;
import com.android.systemui.doze.DozeUi; import com.android.systemui.doze.DozeUi;
@@ -77,11 +78,12 @@ public abstract class DozeModule {
} }
@Provides @Provides
static DozeMachine.Part[] providesDozeMachinePartes(DozePauser dozePauser, static DozeMachine.Part[] providesDozeMachineParts(DozePauser dozePauser,
DozeFalsingManagerAdapter dozeFalsingManagerAdapter, DozeTriggers dozeTriggers, DozeFalsingManagerAdapter dozeFalsingManagerAdapter, DozeTriggers dozeTriggers,
DozeUi dozeUi, DozeScreenState dozeScreenState, DozeUi dozeUi, DozeScreenState dozeScreenState,
DozeScreenBrightness dozeScreenBrightness, DozeWallpaperState dozeWallpaperState, DozeScreenBrightness dozeScreenBrightness, DozeWallpaperState dozeWallpaperState,
DozeDockHandler dozeDockHandler, DozeAuthRemover dozeAuthRemover) { DozeDockHandler dozeDockHandler, DozeAuthRemover dozeAuthRemover,
DozeSuppressor dozeSuppressor) {
return new DozeMachine.Part[]{ return new DozeMachine.Part[]{
dozePauser, dozePauser,
dozeFalsingManagerAdapter, dozeFalsingManagerAdapter,
@@ -91,7 +93,8 @@ public abstract class DozeModule {
dozeScreenBrightness, dozeScreenBrightness,
dozeWallpaperState, dozeWallpaperState,
dozeDockHandler, dozeDockHandler,
dozeAuthRemover dozeAuthRemover,
dozeSuppressor
}; };
} }