From 776f978fe0f16313109171d52a110ce8f69842f4 Mon Sep 17 00:00:00 2001
From: Dave Mankoff <mankoff@google.com>
Date: Tue, 18 Aug 2020 16:32:58 -0400
Subject: [PATCH] Prevent dagger from hanging onto DozeService

Evidently, dagger hangs on to classes marked with @Reusable. This is
not desirable for DozeService. Instead, institute a better fix
which is binding an interface implementation into its subcomponent,
which is the part that needs DozeService to exist.

We can't bind DozeService directly as Dagger complains that you can't
bind classes that already exist in a parent scope. Binding an interface
implementation, however, works well.

Fixes: 165208002
Test: manual
Change-Id: Iae061d636b6e4bdc8bc6a03e9c7daf900610d19f
---
 .../src/com/android/systemui/doze/DozeService.java         | 5 +----
 .../com/android/systemui/doze/dagger/DozeComponent.java    | 3 ++-
 .../src/com/android/systemui/doze/dagger/DozeModule.java   | 7 +++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
index 1a1cc072c6bf8..19b0ea1db04e5 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java
@@ -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();
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java
index 247285434df9a..05050f905e606 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeComponent.java
@@ -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}. */
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 a12e280fcca6b..04f7c368fdc42 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/dagger/DozeModule.java
@@ -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);