From 6f6446bd6de74f6c4932dd9e2e038a4f00368d47 Mon Sep 17 00:00:00 2001 From: Max Tauro Date: Fri, 3 Apr 2020 20:13:12 -0700 Subject: [PATCH] CarSystemUIModule/CarSystemUIRootComponent public Made CarSystemUIBinder and CarSystemUIRootComponent public to allow injection in AAECarSystemUI Bug: 152991117 Test: Treehugger passes Change-Id: Ica3ac2a61e009c687d4afb847d132a8a0d4fd5eb --- .../src/com/android/systemui/CarComponentBinder.java | 3 +-- .../src/com/android/systemui/CarSystemUIModule.java | 2 +- .../src/com/android/systemui/CarSystemUIRootComponent.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/CarComponentBinder.java b/packages/CarSystemUI/src/com/android/systemui/CarComponentBinder.java index f11eff851aa38..d84b2f958feb2 100644 --- a/packages/CarSystemUI/src/com/android/systemui/CarComponentBinder.java +++ b/packages/CarSystemUI/src/com/android/systemui/CarComponentBinder.java @@ -28,7 +28,6 @@ import dagger.Module; @Module(includes = { DefaultActivityBinder.class, DefaultBroadcastReceiverBinder.class, - DefaultServiceBinder.class, - CarSystemUIBinder.class}) + DefaultServiceBinder.class}) public class CarComponentBinder { } diff --git a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java index 5547fee0159cf..c275536e4d92e 100644 --- a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java +++ b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java @@ -65,7 +65,7 @@ import dagger.Module; import dagger.Provides; @Module(includes = {DividerModule.class}) -abstract class CarSystemUIModule { +public abstract class CarSystemUIModule { @Singleton @Provides diff --git a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIRootComponent.java b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIRootComponent.java index 7d544c9a9bd79..0e923f7164bb1 100644 --- a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIRootComponent.java +++ b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIRootComponent.java @@ -40,6 +40,6 @@ import dagger.Component; CarSystemUIModule.class, CarSystemUIBinder.class }) -interface CarSystemUIRootComponent extends SystemUIRootComponent { +public interface CarSystemUIRootComponent extends SystemUIRootComponent { }