From 9f39c2f5564bbe16bc74776f73f8425a7ee1d3f9 Mon Sep 17 00:00:00 2001
From: Zachary Heidepriem <zachh@google.com>
Date: Fri, 10 Nov 2017 15:07:54 -0800
Subject: Use prebuilt guava for dialer.

We are now using guava APIs from guava 20, and AOSP guava is stuck at 18.

Test: mma
Change-Id: Ie053a5d8a30a41c7ce0deaaa01a3e17febc651cf
---
 Android.mk | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 094ad5a6c..9defc7e45 100644
--- a/Android.mk
+++ b/Android.mk
@@ -184,7 +184,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 	dialer-libshortcutbadger-target \
 	dialer-mime4j-core-target \
 	dialer-mime4j-dom-target \
-	guava \
+	dialer-guava-target \
 	jsr305 \
 	libbackup \
 	libphonenumber \
@@ -277,6 +277,16 @@ include $(BUILD_HOST_PREBUILT)
 # Dialer (java:sdk) should not link to dialer-guava (java:platform)
 include $(CLEAR_VARS)
 
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-guava-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 LOCAL_MODULE := dialer-dagger2-target
 LOCAL_SDK_VERSION := current
-- 
cgit v1.2.3


From d3014bf98eed2e3968c81999350e6e8be58910b2 Mon Sep 17 00:00:00 2001
From: erfanian <erfanian@google.com>
Date: Wed, 1 Nov 2017 14:47:48 -0700
Subject: Set the ceiling at O.

Test: no
PiperOrigin-RevId: 174239092
Change-Id: I6672c5b0a41df6426b527d1565f0cb216dc82917
---
 .../dialer/phonelookup/composite/CompositePhoneLookup.java | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
index 10b0e24d2..a9416266c 100644
--- a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
@@ -21,7 +21,6 @@ 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;
@@ -57,15 +56,12 @@ public final class CompositePhoneLookup implements PhoneLookup {
     }
     return Futures.transform(
         Futures.allAsList(futures),
-        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();
+        infos -> {
+          PhoneLookupInfo.Builder mergedInfo = PhoneLookupInfo.newBuilder();
+          for (PhoneLookupInfo info : infos) {
+            mergedInfo.mergeFrom(info);
           }
+          return mergedInfo.build();
         },
         MoreExecutors.directExecutor());
   }
-- 
cgit v1.2.3