Fix NPE in call detail activity for voicemails.
Because the call detail activity is being used for playing voicemails,
this happens when playing voicemails but not looking at more details for
a non-voicemail call because the "details" option is not available for
non-voicemail entries. If the voicemail comes from an unknown number,
the activity attempts to get the number and convert it to a string for
use in intents within the call details activity, but since the number
does not exist, the app crashes instead.
Bug: 19627341
Change-Id: I5302527c1c51c620a66ead85984b2e2399839086
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 69242d3..5dae9d0 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -367,7 +367,8 @@
// We know that all calls are from the same number and the same contact, so pick the
// first.
PhoneCallDetails firstDetails = details[0];
- mNumber = firstDetails.number.toString();
+ mNumber = TextUtils.isEmpty(firstDetails.number) ?
+ null : firstDetails.number.toString();
final int numberPresentation = firstDetails.numberPresentation;
final Uri contactUri = firstDetails.contactUri;
final Uri photoUri = firstDetails.photoUri;
diff --git a/src/com/android/dialer/calllog/PhoneNumberDisplayHelper.java b/src/com/android/dialer/calllog/PhoneNumberDisplayHelper.java
index 0dffd86..c1a5abf 100644
--- a/src/com/android/dialer/calllog/PhoneNumberDisplayHelper.java
+++ b/src/com/android/dialer/calllog/PhoneNumberDisplayHelper.java
@@ -75,7 +75,6 @@
*/
public CharSequence getDisplayNumber(PhoneAccountHandle accountHandle, CharSequence number,
int presentation, CharSequence formattedNumber) {
-
final CharSequence displayName = getDisplayName(accountHandle, number, presentation);
if (!TextUtils.isEmpty(displayName)) {
return displayName;