diff options
| author | Anthony Lee <anthonylee@google.com> | 2014-12-03 21:52:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 21:52:06 +0000 |
| commit | 191b18d204b86afa7668ea1730cd40bebcbb59ff (patch) | |
| tree | a614dd60c6e32574c550574e06adcd5a55f41d6e | |
| parent | 18a751de2d073e95ec506d01d5070dd818ad2ddc (diff) | |
| parent | 148241019a0d3ecde22abcb1767a1be5c9e2caf6 (diff) | |
am 14824101: am 34c4a427: am df47edd9: NPE fix.
* commit '148241019a0d3ecde22abcb1767a1be5c9e2caf6':
NPE fix.
| -rw-r--r-- | src/com/android/dialer/calllog/PhoneAccountUtils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java index 3979a3e5e..adeec0f2b 100644 --- a/src/com/android/dialer/calllog/PhoneAccountUtils.java +++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java @@ -18,7 +18,6 @@ package com.android.dialer.calllog; 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 class PhoneAccountUtils { */ 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; } /** |