commit 72c9053eda382ef3e4450b657801898aced8f904
author Nancy Chen <nancychen@google.com> Mon Mar 23 18:08:24 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 23 18:08:25 2015 +0000
tree b73e93e62c199c211fa12756c565132b8be0ed3e
parent a42f9b7a68a1d9a34b28632a686bceeafe70a5e4
parent 164d9d5cd6d6e723b1af9a565f588cc1b5b09c6c

Merge "Fix NPE in call detail activity for voicemails."

src/com/android/dialer/CallDetailActivity.java

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;

src/com/android/dialer/calllog/PhoneNumberDisplayHelper.java

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;