commit 7eb6be50ed0a6e94ef50eb53b98450117be885e6
author Jay Shrauner <shrauner@google.com> Tue Nov 25 18:44:10 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 25 18:44:10 2014 +0000
tree 1947306002e6da59bf61494d90bbbb25b7fe67d3
parent dd73b9935d76d33a339bc703c232209b976f4acf
parent a9ec21a505f0f3b2ce1ee612ba06970b55db6c1a

am 34b4406d: am a44049e1: Fix NPE in getCallProviderLabel

* commit '34b4406dccd2ddfcdb2846fc6d30f946bcded1ff':
  Fix NPE in getCallProviderLabel

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 5f1fe3b..b66f417 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -576,7 +576,8 @@
      */
     private String getCallProviderLabel(Call call) {
         PhoneAccount account = getAccountForCall(call);
-        if (account != null && getTelecomManager().hasMultipleCallCapableAccounts()) {
+        if (account != null && !TextUtils.isEmpty(account.getLabel())
+                && getTelecomManager().hasMultipleCallCapableAccounts()) {
             return account.getLabel().toString();
         }
         return null;