commit ae8ec453d480bd22c4f489aa24a516cdfca85aed
author Dave Mankoff <mankoff@google.com> Tue Oct 29 15:50:02 2019 -0400
committer Dave Mankoff <mankoff@google.com> Tue Oct 29 15:56:53 2019 -0400
tree d851a084a7b20e85d5bd64998abe97c65c740cd3
parent fff4745389d5b6842b3ff984c48b7a5a308dcc5c

Instances of SystemUI must now define their own ComponentBinder

This will allow us to mark parts of the core system as Optional,
like the StatusBar.

Bug: 140514132
Test: atest SystemUITests
Change-Id: I37f6fa414e9dc2a672dd0bc8cc69ce4049762973

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

diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
index 4e60f19..ca8e53d 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
@@ -30,6 +30,7 @@
 
 import javax.inject.Singleton;
 
+import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 
@@ -38,9 +39,12 @@
  * implementation.
  */
 @Module(includes = {AssistModule.class,
-                    ComponentBinder.class,
                     PeopleHubModule.class})
 public abstract class SystemUIModule {
+    /** */
+    @Binds
+    public abstract ContextComponentHelper bindComponentHelper(
+            ContextComponentResolver componentHelper);
 
     @Singleton
     @Provides
@@ -56,7 +60,6 @@
                 keyguardUpdateMonitor);
     }
 
-
     @Singleton
     @Provides
     static SysUiState provideSysUiState() {