diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-11-25 18:56:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 18:56:21 +0000 |
| commit | 3e1ca95e7121f6664b1653645d1c03601835f2a6 (patch) | |
| tree | 1393a3b6346ed1f6678218ac73dfe45981959ef5 | |
| parent | e244b7f8628cf5373e2dc3c2934e701e4b474583 (diff) | |
| parent | 7eb6be50ed0a6e94ef50eb53b98450117be885e6 (diff) | |
am cb04cc89: am 34b4406d: am a44049e1: Fix NPE in getCallProviderLabel
* commit 'cb04cc89b006406ed7118a89a69c5fed58be49c1':
Fix NPE in getCallProviderLabel
| -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; |