summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/phonelookup
diff options
context:
space:
mode:
authorzachh <zachh@google.com>2017-11-01 16:57:30 -0700
committerzachh <zachh@google.com>2017-11-10 23:40:59 +0000
commit711512175cb047b5ea7c9b15013f3b1fc5c2cae7 (patch)
tree5179208870fdeff6c0108993fca2a695c58bae23 /java/com/android/dialer/phonelookup
parent84ac49babc81c94357706c5073fdb89f27b5fdbd (diff)
Fixed AOSP breakage due to incompatible guava api.
Test: none PiperOrigin-RevId: 174258291 Change-Id: Idf4eb0096fef383bd5f3544fdedba03528d14f41
Diffstat (limited to 'java/com/android/dialer/phonelookup')
-rw-r--r--java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java14
1 files changed, 9 insertions, 5 deletions
diff --git a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
index a9416266c..10b0e24d2 100644
--- a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
@@ -21,6 +21,7 @@ import android.telecom.Call;
import com.android.dialer.DialerPhoneNumber;
import com.android.dialer.phonelookup.PhoneLookup;
import com.android.dialer.phonelookup.PhoneLookupInfo;
+import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -56,12 +57,15 @@ public final class CompositePhoneLookup implements PhoneLookup {
}
return Futures.transform(
Futures.allAsList(futures),
- infos -> {
- PhoneLookupInfo.Builder mergedInfo = PhoneLookupInfo.newBuilder();
- for (PhoneLookupInfo info : infos) {
- mergedInfo.mergeFrom(info);
+ new Function<List<PhoneLookupInfo>, PhoneLookupInfo>() {
+ @Override
+ public PhoneLookupInfo apply(List<PhoneLookupInfo> infos) {
+ PhoneLookupInfo.Builder mergedInfo = PhoneLookupInfo.newBuilder();
+ for (PhoneLookupInfo info : infos) {
+ mergedInfo.mergeFrom(info);
+ }
+ return mergedInfo.build();
}
- return mergedInfo.build();
},
MoreExecutors.directExecutor());
}