From d16c3775149c6eb02daed287fe33383c1d26f322 Mon Sep 17 00:00:00 2001 From: Brandon Maxwell Date: Fri, 23 Oct 2015 21:07:06 +0000 Subject: Revert "Call log respects display name order preferences" This reverts commit 327fb5bb609a6bee44a62888d671c951b19782fd. Change-Id: I134f0a26697bec20b746a6e8f041a715d8e95136 --- src/com/android/dialer/contactinfo/ContactInfoCache.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/com/android/dialer/contactinfo/ContactInfoCache.java') diff --git a/src/com/android/dialer/contactinfo/ContactInfoCache.java b/src/com/android/dialer/contactinfo/ContactInfoCache.java index 1e2457957..568f48886 100644 --- a/src/com/android/dialer/contactinfo/ContactInfoCache.java +++ b/src/com/android/dialer/contactinfo/ContactInfoCache.java @@ -162,7 +162,7 @@ public class ContactInfoCache { // The contact info is no longer up to date, we should request it. However, we // do not need to request them immediately. enqueueRequest(number, countryIso, cachedContactInfo, false); - } else if (!callLogInfoMatches(cachedContactInfo, info)) { + } else if (!callLogInfoMatches(cachedContactInfo, info)) { // The call log information does not match the one we have, look it up again. // We could simply update the call log directly, but that needs to be done in a // background thread, so it is easier to simply request a new lookup, which will, as @@ -309,7 +309,8 @@ public class ContactInfoCache { * Checks whether the contact info from the call log matches the one from the contacts db. */ private boolean callLogInfoMatches(ContactInfo callLogInfo, ContactInfo info) { - // The call log only contains a subset of the fields in the contacts db. Only check those. + // The call log only contains a subset of the fields in the contacts db. + // Only check those. return TextUtils.equals(callLogInfo.name, info.name) && callLogInfo.type == info.type && TextUtils.equals(callLogInfo.label, info.label); -- cgit v1.2.3