diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-11 01:54:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-11 01:54:25 +0000 |
| commit | da26bc7cffc46718e989371b16198422b5ff1a3a (patch) | |
| tree | 1419e62a9b956b32333e076328428ce172a3b8cd | |
| parent | cd8d440128b7ee653d80509faa6132684dfb0b38 (diff) | |
| parent | d3014bf98eed2e3968c81999350e6e8be58910b2 (diff) | |
Merge changes I6672c5b0,Ie053a5d8
* changes:
Set the ceiling at O.
Use prebuilt guava for dialer.
| -rw-r--r-- | Android.mk | 12 | ||||
| -rw-r--r-- | java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java | 14 |
2 files changed, 16 insertions, 10 deletions
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 \ @@ -278,6 +278,16 @@ include $(BUILD_HOST_PREBUILT) 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 LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) 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()); } |