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 | a44049e1d1e39daa32cda9485d72fcb23f9498dd (patch) | |
| tree | 4b9e4c0cf5c1bff1c18fb21a6fd10ac9009addef | |
| parent | fdeb4feb33cf01036067799d6f00dd733dc48d01 (diff) | |
| download | packages_apps_InCallUI-a44049e1d1e39daa32cda9485d72fcb23f9498dd.tar.gz packages_apps_InCallUI-a44049e1d1e39daa32cda9485d72fcb23f9498dd.tar.bz2 packages_apps_InCallUI-a44049e1d1e39daa32cda9485d72fcb23f9498dd.zip | |
Fix NPE in getCallProviderLabel
Bug:18506544
Change-Id: I720e090bdda87904f61fa6fd0f1aa95844a4fe71
| -rw-r--r-- | src/com/android/incallui/CallCardPresenter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java index 5f1fe3bd..b66f4179 100644 --- a/src/com/android/incallui/CallCardPresenter.java +++ b/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; |