commit efed8dc92f6dcc652599f93884576cf61a1103a8
author Flavio Lerda <flerda@google.com> Tue Oct 18 07:22:33 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 18 07:22:33 2011 -0700
tree 1b1b10db574c4a61af2a67a0c311bb8b1025f633
parent 0296cb0a12b8b24b960172ceb594f8c92fbfba21
parent 1d18da7d48d31aa5f5ee94e188e80400eac03595

Merge "Also look up number as an "Internet call" address."

src/com/android/contacts/calllog/ContactInfoHelper.java

diff --git a/src/com/android/contacts/calllog/ContactInfoHelper.java b/src/com/android/contacts/calllog/ContactInfoHelper.java
index c837c9a..f1987ce 100644
--- a/src/com/android/contacts/calllog/ContactInfoHelper.java
+++ b/src/com/android/contacts/calllog/ContactInfoHelper.java
@@ -67,7 +67,14 @@
             }
             info = sipInfo;
         } else {
-            info = queryContactInfoForPhoneNumber(number, countryIso);
+            // Look for a contact that has the given phone number.
+            ContactInfo phoneInfo = queryContactInfoForPhoneNumber(number, countryIso);
+
+            if (phoneInfo == null || phoneInfo == ContactInfo.EMPTY) {
+                // Check whether the phone number has been saved as an "Internet call" number.
+                phoneInfo = queryContactInfoForSipAddress(number);
+            }
+            info = phoneInfo;
         }
 
         final ContactInfo updatedInfo;