summaryrefslogtreecommitdiff
path: root/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/dialer/calllog/DefaultVoicemailNotifier.java')
-rw-r--r--src/com/android/dialer/calllog/DefaultVoicemailNotifier.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
index e551e6044..8bac657a2 100644
--- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
+++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java
@@ -122,7 +122,8 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier {
name = mNameLookupQuery.query(newCall.number);
// If we cannot lookup the contact, use the number instead.
if (name == null) {
- name = mPhoneNumberHelper.getDisplayNumber(newCall.number, "").toString();
+ name = mPhoneNumberHelper.getDisplayNumber(newCall.number,
+ newCall.numberPresentation, "").toString();
if (TextUtils.isEmpty(name)) {
name = newCall.number;
}
@@ -210,11 +211,14 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier {
public final Uri callsUri;
public final Uri voicemailUri;
public final String number;
+ public final int numberPresentation;
- public NewCall(Uri callsUri, Uri voicemailUri, String number) {
+ public NewCall(Uri callsUri, Uri voicemailUri, String number,
+ int numberPresentation) {
this.callsUri = callsUri;
this.voicemailUri = voicemailUri;
this.number = number;
+ this.numberPresentation = numberPresentation;
}
}
@@ -237,11 +241,13 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier {
*/
private static final class DefaultNewCallsQuery implements NewCallsQuery {
private static final String[] PROJECTION = {
- Calls._ID, Calls.NUMBER, Calls.VOICEMAIL_URI
+ Calls._ID, Calls.NUMBER, Calls.NUMBER_PRESENTATION,
+ Calls.VOICEMAIL_URI
};
private static final int ID_COLUMN_INDEX = 0;
private static final int NUMBER_COLUMN_INDEX = 1;
private static final int VOICEMAIL_URI_COLUMN_INDEX = 2;
+ private static final int NUMBER_PRESENTATION_COLUMN_INDEX = 3;
private final ContentResolver mContentResolver;
@@ -276,7 +282,8 @@ public class DefaultVoicemailNotifier implements VoicemailNotifier {
Uri callsUri = ContentUris.withAppendedId(
Calls.CONTENT_URI_WITH_VOICEMAIL, cursor.getLong(ID_COLUMN_INDEX));
Uri voicemailUri = voicemailUriString == null ? null : Uri.parse(voicemailUriString);
- return new NewCall(callsUri, voicemailUri, cursor.getString(NUMBER_COLUMN_INDEX));
+ return new NewCall(callsUri, voicemailUri, cursor.getString(NUMBER_COLUMN_INDEX),
+ cursor.getInt(NUMBER_PRESENTATION_COLUMN_INDEX));
}
}