diff options
author | Jay Shrauner <shrauner@google.com> | 2014-11-24 15:24:31 -0800 |
---|---|---|
committer | Jay Shrauner <shrauner@google.com> | 2014-11-24 15:26:53 -0800 |
commit | 15b3fb7207bc356b2ee6ce1e8264d8242bb092ec (patch) | |
tree | 0b24fa6483dbc93f0c4bcd804896c0e5d91eb4c4 | |
parent | 39cf685a78213b430e74e2a7429861e2e5b96dbe (diff) |
Fix NPE in getCallProviderLabel
Bug:18506544
Change-Id: I720e090bdda87904f61fa6fd0f1aa95844a4fe71
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 5f1fe3bd1..b66f41791 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -576,7 +576,8 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> */ 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; |