diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-12 02:48:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-12 02:48:25 +0000 |
| commit | 6bd659e6e90346f58ed08f6c127835a320bbd2e4 (patch) | |
| tree | b90e5f582dcab0d3ad6393f4ffbc7a4dd78e81dc /java/com/android/dialer/phonelookup/PhoneLookupModule.java | |
| parent | 58bade2ace277dff4db3bbbfa2e07015f0f7c6ad (diff) | |
| parent | 01aac5de58903555a089d16a58b9346d34d54e7b (diff) | |
Merge changes I2e091371,I4e0bc1c6,I24063ee4
* changes:
Implement PhoneLookup for CP2 remote contacts
Merge PhoneLookupDataSource results into a proto in annotated call log.
Attempt to place call even call permission is missing
Diffstat (limited to 'java/com/android/dialer/phonelookup/PhoneLookupModule.java')
| -rw-r--r-- | java/com/android/dialer/phonelookup/PhoneLookupModule.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/com/android/dialer/phonelookup/PhoneLookupModule.java b/java/com/android/dialer/phonelookup/PhoneLookupModule.java index 5e215bafe..e93ca0f77 100644 --- a/java/com/android/dialer/phonelookup/PhoneLookupModule.java +++ b/java/com/android/dialer/phonelookup/PhoneLookupModule.java @@ -19,6 +19,7 @@ package com.android.dialer.phonelookup; import com.android.dialer.phonelookup.blockednumber.DialerBlockedNumberPhoneLookup; import com.android.dialer.phonelookup.composite.CompositePhoneLookup; import com.android.dialer.phonelookup.cp2.Cp2LocalPhoneLookup; +import com.android.dialer.phonelookup.cp2.Cp2RemotePhoneLookup; import com.google.common.collect.ImmutableList; import dagger.Module; import dagger.Provides; @@ -31,8 +32,10 @@ public abstract class PhoneLookupModule { @SuppressWarnings({"unchecked", "rawtype"}) static ImmutableList<PhoneLookup> providePhoneLookupList( Cp2LocalPhoneLookup cp2LocalPhoneLookup, + Cp2RemotePhoneLookup cp2RemotePhoneLookup, DialerBlockedNumberPhoneLookup dialerBlockedNumberPhoneLookup) { - return ImmutableList.of(cp2LocalPhoneLookup, dialerBlockedNumberPhoneLookup); + return ImmutableList.of( + cp2LocalPhoneLookup, cp2RemotePhoneLookup, dialerBlockedNumberPhoneLookup); } @Provides |