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

Merge "Prevent dagger from hanging onto DozeService"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-18 22:52:49 +00:00
committed by Android (Google) Code Review
parent f16f9be862 776f978fe0
commit 0f56d5d518
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/doze/DozeService.java
View File

@@ -33,9 +33,6 @@ import java.io.PrintWriter;
import javax.inject.Inject;
import dagger.Reusable;
@Reusable // Don't create multiple DozeServices.
public class DozeService extends DreamService
implements DozeMachine.Service, RequestDoze, PluginListener<DozeServicePlugin> {
private static final String TAG = "DozeService";
@@ -60,7 +57,7 @@ public class DozeService extends DreamService
setWindowless(true);
mPluginManager.addPluginListener(this, DozeServicePlugin.class, false /* allowMultiple */);
DozeComponent dozeComponent = mDozeComponentBuilder.build();
DozeComponent dozeComponent = mDozeComponentBuilder.build(this);
mDozeMachine = dozeComponent.getDozeMachine();
}

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

@@ -19,6 +19,7 @@ package com.android.systemui.doze.dagger;
import com.android.systemui.doze.DozeMachine;
import com.android.systemui.doze.DozeService;
import dagger.BindsInstance;
import dagger.Subcomponent;
/**
@@ -30,7 +31,7 @@ public interface DozeComponent {
/** Simple Builder for {@link DozeComponent}. */
@Subcomponent.Factory
interface Builder {
DozeComponent build();
DozeComponent build(@BindsInstance DozeMachine.Service dozeMachineService);
}
/** Supply a {@link DozeMachine}. */

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

@@ -33,7 +33,6 @@ 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.DozeService;
import com.android.systemui.doze.DozeSuspendScreenStatePreventingAdapter;
import com.android.systemui.doze.DozeTriggers;
import com.android.systemui.doze.DozeUi;
@@ -52,9 +51,9 @@ public abstract class DozeModule {
@Provides
@DozeScope
@WrappedService
static DozeMachine.Service providesWrappedService(DozeService dozeService, DozeHost dozeHost,
DozeParameters dozeParameters) {
DozeMachine.Service wrappedService = dozeService;
static DozeMachine.Service providesWrappedService(DozeMachine.Service dozeMachineService,
DozeHost dozeHost, DozeParameters dozeParameters) {
DozeMachine.Service wrappedService = dozeMachineService;
wrappedService = new DozeBrightnessHostForwarder(wrappedService, dozeHost);
wrappedService = DozeScreenStatePreventingAdapter.wrapIfNeeded(
wrappedService, dozeParameters);