diff options
author | erfanian <erfanian@google.com> | 2017-11-11 02:03:16 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-11-11 02:03:16 +0000 |
commit | cbc99c2081f6bd5214f8830789550ee5b535153a (patch) | |
tree | c98e2553c224f8d0f87f7ac8032076f50b8c143d | |
parent | cb2ace30f3751a45ad5a5a464a04738557d78e4d (diff) | |
parent | f48ab3d1c3de71ecaf68d6a696f440cca2ed9f80 (diff) |
Merge changes I6672c5b0,Ie053a5d8 am: da26bc7cff am: f88aaa1ceb
am: f48ab3d1c3
Change-Id: I6e8976dc322ae79a5924958a7cc675556913259a
-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 87bf36f89..654dd3317 100644 --- a/Android.mk +++ b/Android.mk @@ -189,7 +189,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dialer-libshortcutbadger-target \ dialer-mime4j-core-target \ dialer-mime4j-dom-target \ - guava \ + dialer-guava-target \ jsr305 \ libbackup \ libphonenumber \ @@ -283,6 +283,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()); } |