commit 15b3fb7207bc356b2ee6ce1e8264d8242bb092ec
author Jay Shrauner <shrauner@google.com> Mon Nov 24 15:24:31 2014 -0800
committer Jay Shrauner <shrauner@google.com> Mon Nov 24 15:26:53 2014 -0800
tree 0b24fa6483dbc93f0c4bcd804896c0e5d91eb4c4
parent 39cf685a78213b430e74e2a7429861e2e5b96dbe

Fix NPE in getCallProviderLabel

Bug:18506544
Change-Id: I720e090bdda87904f61fa6fd0f1aa95844a4fe71

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;