Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01eeccd8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add DozeSuppressor to DozeModule" into tm-dev

parents c4c1ac53 6c41ca43

packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java

+8 −0
Original line number Diff line number Diff line
@@ -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) {

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

+6 −3
Original line number Diff line number Diff line
@@ -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

        };

    }