commit 711512175cb047b5ea7c9b15013f3b1fc5c2cae7
author zachh <zachh@google.com> Wed Nov 01 16:57:30 2017 -0700
committer zachh <zachh@google.com> Fri Nov 10 23:40:59 2017 +0000
tree 5179208870fdeff6c0108993fca2a695c58bae23
parent 84ac49babc81c94357706c5073fdb89f27b5fdbd

Fixed AOSP breakage due to incompatible guava api.

Test: none
PiperOrigin-RevId: 174258291
Change-Id: Idf4eb0096fef383bd5f3544fdedba03528d14f41

java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java

diff --git a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
index a941626..10b0e24 100644
--- a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
@@ -21,6 +21,7 @@
 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 @@
     }
     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());
   }