diff options
Diffstat (limited to 'java/com/android/dialer')
13 files changed, 37 insertions, 0 deletions
diff --git a/java/com/android/dialer/calllog/CallLogModule.java b/java/com/android/dialer/calllog/CallLogModule.java index 56572705d..0e3a3be9e 100644 --- a/java/com/android/dialer/calllog/CallLogModule.java +++ b/java/com/android/dialer/calllog/CallLogModule.java @@ -22,11 +22,14 @@ import com.android.dialer.calllog.datasources.DataSources; import com.android.dialer.calllog.datasources.phonelookup.PhoneLookupDataSource; import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource; import com.android.dialer.calllog.datasources.voicemail.VoicemailDataSource; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.google.common.collect.ImmutableList; import dagger.Module; import dagger.Provides; /** Dagger module which satisfies call log dependencies. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module(includes = CallLogDatabaseModule.class) public abstract class CallLogModule { diff --git a/java/com/android/dialer/commandline/CommandLineComponent.java b/java/com/android/dialer/commandline/CommandLineComponent.java index c9abc532d..50a1ff2b2 100644 --- a/java/com/android/dialer/commandline/CommandLineComponent.java +++ b/java/com/android/dialer/commandline/CommandLineComponent.java @@ -19,6 +19,7 @@ package com.android.dialer.commandline; import android.content.Context; import com.android.dialer.function.Supplier; import com.android.dialer.inject.HasRootComponent; +import com.android.dialer.inject.IncludeInDialerRoot; import com.google.common.collect.ImmutableMap; import dagger.Subcomponent; @@ -34,6 +35,7 @@ public abstract class CommandLineComponent { } /** Used to refer to the root application component. */ + @IncludeInDialerRoot public interface HasComponent { CommandLineComponent commandLineComponent(); } diff --git a/java/com/android/dialer/commandline/CommandLineModule.java b/java/com/android/dialer/commandline/CommandLineModule.java index c78de21e5..c3b58d1d5 100644 --- a/java/com/android/dialer/commandline/CommandLineModule.java +++ b/java/com/android/dialer/commandline/CommandLineModule.java @@ -23,12 +23,15 @@ import com.android.dialer.commandline.impl.Echo; import com.android.dialer.commandline.impl.Help; import com.android.dialer.commandline.impl.Version; import com.android.dialer.function.Supplier; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.google.common.collect.ImmutableMap; import dagger.Module; import dagger.Provides; import javax.inject.Inject; /** Provides {@link Command} */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class CommandLineModule { diff --git a/java/com/android/dialer/feedback/stub/StubFeedbackModule.java b/java/com/android/dialer/feedback/stub/StubFeedbackModule.java index 49df09a04..19f7e2e6c 100644 --- a/java/com/android/dialer/feedback/stub/StubFeedbackModule.java +++ b/java/com/android/dialer/feedback/stub/StubFeedbackModule.java @@ -20,6 +20,8 @@ import android.content.Context; import com.android.dialer.common.LogUtil; import com.android.dialer.feedback.FeedbackSender; import com.android.dialer.inject.ApplicationContext; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.android.dialer.logging.LoggingBindings; import com.android.dialer.logging.LoggingBindingsFactory; import com.android.dialer.logging.LoggingBindingsStub; @@ -28,6 +30,7 @@ import dagger.Module; import dagger.Provides; /** Module which bind {@link com.android.dialer.feedback.stub.CallFeedbackListenerStub}. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public class StubFeedbackModule { diff --git a/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java b/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java index 79629d69e..d4199f0a8 100644 --- a/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java +++ b/java/com/android/dialer/glidephotomanager/GlidePhotoManagerModule.java @@ -17,11 +17,14 @@ package com.android.dialer.glidephotomanager; import com.android.dialer.glidephotomanager.impl.GlidePhotoManagerImpl; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import dagger.Binds; import dagger.Module; import javax.inject.Singleton; /** Module for {@link GlidePhotoManagerComponent} */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class GlidePhotoManagerModule { @Binds diff --git a/java/com/android/dialer/metrics/StubMetricsModule.java b/java/com/android/dialer/metrics/StubMetricsModule.java index a2d9ebfe2..46b2b4d84 100644 --- a/java/com/android/dialer/metrics/StubMetricsModule.java +++ b/java/com/android/dialer/metrics/StubMetricsModule.java @@ -16,10 +16,13 @@ package com.android.dialer.metrics; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import dagger.Binds; import dagger.Module; /** Binds stub {@link Metrics}. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public interface StubMetricsModule { diff --git a/java/com/android/dialer/phonelookup/PhoneLookupComponent.java b/java/com/android/dialer/phonelookup/PhoneLookupComponent.java index 832587c81..70743c84d 100644 --- a/java/com/android/dialer/phonelookup/PhoneLookupComponent.java +++ b/java/com/android/dialer/phonelookup/PhoneLookupComponent.java @@ -17,6 +17,7 @@ package com.android.dialer.phonelookup; import android.content.Context; import com.android.dialer.inject.HasRootComponent; +import com.android.dialer.inject.IncludeInDialerRoot; import com.android.dialer.phonelookup.composite.CompositePhoneLookup; import dagger.Subcomponent; @@ -32,6 +33,7 @@ public abstract class PhoneLookupComponent { } /** Used to refer to the root application component. */ + @IncludeInDialerRoot public interface HasComponent { PhoneLookupComponent phoneLookupComponent(); } diff --git a/java/com/android/dialer/phonelookup/PhoneLookupModule.java b/java/com/android/dialer/phonelookup/PhoneLookupModule.java index 16aa8e516..6d5ffd2ec 100644 --- a/java/com/android/dialer/phonelookup/PhoneLookupModule.java +++ b/java/com/android/dialer/phonelookup/PhoneLookupModule.java @@ -16,6 +16,8 @@ package com.android.dialer.phonelookup; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.android.dialer.phonelookup.blockednumber.SystemBlockedNumberPhoneLookup; import com.android.dialer.phonelookup.cequint.CequintPhoneLookup; import com.android.dialer.phonelookup.cnap.CnapPhoneLookup; @@ -28,6 +30,7 @@ import dagger.Module; import dagger.Provides; /** Dagger module which binds the PhoneLookup implementation. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class PhoneLookupModule { diff --git a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java index 3878ac508..db4f7fa43 100644 --- a/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java +++ b/java/com/android/dialer/phonenumbergeoutil/impl/PhoneNumberGeoUtilModule.java @@ -16,12 +16,15 @@ package com.android.dialer.phonenumbergeoutil.impl; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.android.dialer.phonenumbergeoutil.PhoneNumberGeoUtil; import dagger.Binds; import dagger.Module; import javax.inject.Singleton; /** Module which binds {@link PhoneNumberGeoUtilImpl}. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class PhoneNumberGeoUtilModule { diff --git a/java/com/android/dialer/precall/impl/PreCallModule.java b/java/com/android/dialer/precall/impl/PreCallModule.java index 455453ef3..fa78cba5c 100644 --- a/java/com/android/dialer/precall/impl/PreCallModule.java +++ b/java/com/android/dialer/precall/impl/PreCallModule.java @@ -16,6 +16,8 @@ package com.android.dialer.precall.impl; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.android.dialer.precall.PreCall; import com.android.dialer.precall.PreCallAction; import com.google.common.collect.ImmutableList; @@ -25,6 +27,7 @@ import dagger.Provides; import javax.inject.Singleton; /** Dagger module for {@link PreCall}. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class PreCallModule { diff --git a/java/com/android/dialer/simulator/impl/SimulatorModule.java b/java/com/android/dialer/simulator/impl/SimulatorModule.java index 2bc72c956..af554b66f 100644 --- a/java/com/android/dialer/simulator/impl/SimulatorModule.java +++ b/java/com/android/dialer/simulator/impl/SimulatorModule.java @@ -16,6 +16,8 @@ package com.android.dialer.simulator.impl; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.android.dialer.simulator.Simulator; import com.android.dialer.simulator.SimulatorConnectionsBank; import dagger.Binds; @@ -23,6 +25,7 @@ import dagger.Module; import javax.inject.Singleton; /** This module provides an instance of the simulator. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class SimulatorModule { @Binds diff --git a/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java b/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java index 36314e7a9..6a002f0e1 100644 --- a/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java +++ b/java/com/android/dialer/simulator/stub/StubSimulatorEnrichedCallModule.java @@ -16,12 +16,15 @@ package com.android.dialer.simulator.stub; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.android.dialer.simulator.SimulatorEnrichedCall; import dagger.Binds; import dagger.Module; import javax.inject.Singleton; /** Provides a stub instance of SimulatorEnrichedCall. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class StubSimulatorEnrichedCallModule { @Binds diff --git a/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java b/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java index 6ece874fe..ac6416cfc 100644 --- a/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java +++ b/java/com/android/dialer/strictmode/impl/SystemStrictModeModule.java @@ -16,12 +16,15 @@ package com.android.dialer.strictmode.impl; +import com.android.dialer.inject.DialerVariant; +import com.android.dialer.inject.InstallIn; import com.android.dialer.strictmode.DialerStrictMode; import dagger.Binds; import dagger.Module; import javax.inject.Singleton; /** Module which binds {@link SystemDialerStrictMode}. */ +@InstallIn(variants = {DialerVariant.DIALER_TEST}) @Module public abstract class SystemStrictModeModule { |