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

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

Merge "Prevent dagger from hanging onto DozeService"

parents f16f9be8 776f978f

packages/SystemUI/src/com/android/systemui/doze/DozeService.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -33,9 +33,6 @@ import java.io.PrintWriter; 




import javax.inject.Inject;

import javax.inject.Inject;





import dagger.Reusable;



@Reusable  // Don't create multiple DozeServices.

public class DozeService extends DreamService

public class DozeService extends DreamService

        implements DozeMachine.Service, RequestDoze, PluginListener<DozeServicePlugin> {

        implements DozeMachine.Service, RequestDoze, PluginListener<DozeServicePlugin> {

    private static final String TAG = "DozeService";

    private static final String TAG = "DozeService";
@@ -60,7 +57,7 @@ public class DozeService extends DreamService 
        setWindowless(true);

        setWindowless(true);





        mPluginManager.addPluginListener(this, DozeServicePlugin.class, false /* allowMultiple */);

        mPluginManager.addPluginListener(this, DozeServicePlugin.class, false /* allowMultiple */);

        DozeComponent dozeComponent = mDozeComponentBuilder.build();

        DozeComponent dozeComponent = mDozeComponentBuilder.build(this);

        mDozeMachine = dozeComponent.getDozeMachine();

        mDozeMachine = dozeComponent.getDozeMachine();

    }

    }

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.doze.dagger; 
import com.android.systemui.doze.DozeMachine;

import com.android.systemui.doze.DozeMachine;

import com.android.systemui.doze.DozeService;

import com.android.systemui.doze.DozeService;





import dagger.BindsInstance;

import dagger.Subcomponent;

import dagger.Subcomponent;





/**

/**
@@ -30,7 +31,7 @@ public interface DozeComponent { 
    /** Simple Builder for {@link DozeComponent}. */

    /** Simple Builder for {@link DozeComponent}. */

    @Subcomponent.Factory

    @Subcomponent.Factory

    interface Builder {

    interface Builder {

        DozeComponent build();

        DozeComponent build(@BindsInstance DozeMachine.Service dozeMachineService);

    }

    }





    /** Supply a {@link DozeMachine}. */

    /** Supply a {@link DozeMachine}. */

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ 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.DozeService;

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;
@@ -52,9 +51,9 @@ public abstract class DozeModule { 
    @Provides

    @Provides

    @DozeScope

    @DozeScope

    @WrappedService

    @WrappedService

    static DozeMachine.Service providesWrappedService(DozeService dozeService, DozeHost dozeHost,

    static DozeMachine.Service providesWrappedService(DozeMachine.Service dozeMachineService,

            DozeParameters dozeParameters) {

            DozeHost dozeHost, DozeParameters dozeParameters) {

        DozeMachine.Service wrappedService = dozeService;

        DozeMachine.Service wrappedService = dozeMachineService;

        wrappedService = new DozeBrightnessHostForwarder(wrappedService, dozeHost);

        wrappedService = new DozeBrightnessHostForwarder(wrappedService, dozeHost);

        wrappedService = DozeScreenStatePreventingAdapter.wrapIfNeeded(

        wrappedService = DozeScreenStatePreventingAdapter.wrapIfNeeded(

                wrappedService, dozeParameters);

                wrappedService, dozeParameters);