diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-05-11 20:18:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-11 20:18:46 +0000 |
| commit | 14ceb5d6cee235b772f5f3dba38802665f12ab66 (patch) | |
| tree | 4e43dc9a6d507693e68e9fe32eba0201b843888b /java/com/android/dialer/calllog/CallLogModule.java | |
| parent | ced93f2d22bffce3b4cfb9c3bfce862b385537dd (diff) | |
| parent | ef5c101361fc4cf23c12aa7ef24d027155b7554a (diff) | |
Merge changes Ie424d231,Ied6072ca,I1902e527,Ie649a9fb,I11fc1a02, ...
* changes:
Use old BottomSheetBehavior.
Use listeners to drive fragment lifecycles.
Add SpamMetadata to SpamStatus
Prevent showDialpad from adding multiple instances of fragments
Update logging in incallactivity.
Revert null check on dialpadHint
Add @InstallIn and @IncludeInDialerRoot to dagger modules in dialer codebase.
Add RTT after call promo bottomsheet.
Diffstat (limited to 'java/com/android/dialer/calllog/CallLogModule.java')
| -rw-r--r-- | java/com/android/dialer/calllog/CallLogModule.java | 3 |
1 files changed, 3 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 { |