commit 34c4a427e03ecdfb64233d6fcfba29f15eeaf556
author Anthony Lee <anthonylee@google.com> Wed Dec 03 18:36:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 03 18:36:40 2014 +0000
tree a614dd60c6e32574c550574e06adcd5a55f41d6e
parent 8e05055f2dbbbe1f16a1c437ba97ee52df9aa339
parent df47edd9c77a0117c34dd73ef6ef4468dac221e8

am df47edd9: NPE fix.

* commit 'df47edd9c77a0117c34dd73ef6ef4468dac221e8':
  NPE fix.

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

diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 3979a3e..adeec0f 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -18,7 +18,6 @@
 
 import android.content.ComponentName;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -65,7 +64,10 @@
      */
     public static String getAccountLabel(Context context, PhoneAccountHandle accountHandle) {
         PhoneAccount account = getAccountOrNull(context, accountHandle);
-        return account == null ? null : account.getLabel().toString();
+        if (account != null && account.getLabel() != null) {
+            return account.getLabel().toString();
+        }
+        return null;
     }
 
     /**