am 99af2e81: am 41577efb: am 75245f68: Fixes how voicemail looks up contact names
* commit '99af2e818e8ec033821d6d955fb3834879741309':
Fixes how voicemail looks up contact names
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index cb3d994..14e1bed 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -118,12 +118,12 @@
// Check if we already know the name associated with this number.
String name = names.get(newCall.number);
if (name == null) {
- // Look it up in the database.
- name = mNameLookupQuery.query(newCall.number);
+ name = mPhoneNumberHelper.getDisplayName(newCall.number,
+ newCall.numberPresentation).toString();
// If we cannot lookup the contact, use the number instead.
- if (name == null) {
- name = mPhoneNumberHelper.getDisplayNumber(newCall.number,
- newCall.numberPresentation, "").toString();
+ if (TextUtils.isEmpty(name)) {
+ // Look it up in the database.
+ name = mNameLookupQuery.query(newCall.number);
if (TextUtils.isEmpty(name)) {
name = newCall.number;
}
diff --git a/src/com/android/dialer/calllog/PhoneNumberHelper.java b/src/com/android/dialer/calllog/PhoneNumberHelper.java
index 5a882e8..336facb 100644
--- a/src/com/android/dialer/calllog/PhoneNumberHelper.java
+++ b/src/com/android/dialer/calllog/PhoneNumberHelper.java
@@ -33,14 +33,7 @@
mResources = resources;
}
- /**
- * Returns the string to display for the given phone number.
- *
- * @param number the number to display
- * @param formattedNumber the formatted number if available, may be null
- */
- public CharSequence getDisplayNumber(CharSequence number,
- int presentation, CharSequence formattedNumber) {
+ /* package */ CharSequence getDisplayName(CharSequence number, int presentation) {
if (presentation == Calls.PRESENTATION_UNKNOWN) {
return mResources.getString(R.string.unknown);
}
@@ -50,15 +43,34 @@
if (presentation == Calls.PRESENTATION_PAYPHONE) {
return mResources.getString(R.string.payphone);
}
- if (TextUtils.isEmpty(number)) {
- return "";
- }
if (new PhoneNumberUtilsWrapper().isVoicemailNumber(number)) {
return mResources.getString(R.string.voicemail);
}
if (PhoneNumberUtilsWrapper.isLegacyUnknownNumbers(number)) {
return mResources.getString(R.string.unknown);
}
+ return "";
+ }
+
+ /**
+ * Returns the string to display for the given phone number.
+ *
+ * @param number the number to display
+ * @param formattedNumber the formatted number if available, may be null
+ */
+ public CharSequence getDisplayNumber(CharSequence number,
+ int presentation, CharSequence formattedNumber) {
+
+ final CharSequence displayName = getDisplayName(number, presentation);
+
+ if (!TextUtils.isEmpty(displayName)) {
+ return displayName;
+ }
+
+ if (TextUtils.isEmpty(number)) {
+ return "";
+ }
+
if (TextUtils.isEmpty(formattedNumber)) {
return number;
} else {