1 files changed, 8 insertions, 2 deletions
diff --git a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
index ee2244615..bb7856fff 100644
--- a/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
+++ b/java/com/android/dialer/phonelookup/composite/CompositePhoneLookup.java
@@ -112,14 +112,15 @@ public final class CompositePhoneLookup implements PhoneLookup {
               ImmutableMap.builder();
           for (DialerPhoneNumber dialerPhoneNumber : existingInfoMap.keySet()) {
             PhoneLookupInfo.Builder combinedInfo = PhoneLookupInfo.newBuilder();
-            for (ImmutableMap<DialerPhoneNumber, PhoneLookupInfo> map : allMaps) {
+            for (int i = 0; i < allMaps.size(); i++) {
+              ImmutableMap<DialerPhoneNumber, PhoneLookupInfo> map = allMaps.get(i);
               PhoneLookupInfo subInfo = map.get(dialerPhoneNumber);
               if (subInfo == null) {
                 throw new IllegalStateException(
                     "A sublookup didn't return an info for number: "
                         + LogUtil.sanitizePhoneNumber(dialerPhoneNumber.getRawInput().getNumber()));
               }
-              combinedInfo.mergeFrom(subInfo);
+              phoneLookups.get(i).copySubMessage(combinedInfo, subInfo);
             }
             combinedMap.put(dialerPhoneNumber, combinedInfo.build());
           }
@@ -129,6 +130,11 @@ public final class CompositePhoneLookup implements PhoneLookup {
   }
 
   @Override
+  public void copySubMessage(PhoneLookupInfo.Builder destination, PhoneLookupInfo source) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
   public ListenableFuture<Void> onSuccessfulBulkUpdate() {
     List<ListenableFuture<Void>> futures = new ArrayList<>();
     for (PhoneLookup phoneLookup : phoneLookups) {