diff options
| author | Sailesh Nepal <sail@google.com> | 2014-07-14 19:39:59 -0700 |
|---|---|---|
| committer | Sailesh Nepal <sail@google.com> | 2014-07-14 19:39:59 -0700 |
| commit | a39948564946dabae36a7201eb5c28d8941b96c3 (patch) | |
| tree | 4fbac1563687b7c9320f67c306cbf8df2cacb6f2 | |
| parent | 121213bc2768e7666454b0940f23a77621936b5f (diff) | |
Fix null PhoneAccountMeta data crash
Change-Id: Ifb9c7fea6f95aa8662cc3780ff2ee92ace8572ef
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 9e400d738..32becd286 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -22,6 +22,7 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.telecomm.CallCapabilities; import android.telecomm.PhoneAccount; +import android.telecomm.PhoneAccountMetadata; import android.telecomm.TelecommManager; import android.telephony.DisconnectCause; import android.text.TextUtils; @@ -406,8 +407,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private Drawable getConnectionIcon() { PhoneAccount account = mPrimary.getAccount(); if (account != null) { - return getTelecommManager().getPhoneAccountMetadata(account) - .getIcon(mContext); + PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account); + if (data != null) { + return data.getIcon(mContext); + } } return null; } @@ -431,7 +434,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } PhoneAccount account = mPrimary.getAccount(); if (account != null) { - return getTelecommManager().getPhoneAccountMetadata(account).getLabel(); + PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account); + if (data != null) { + return data.getLabel(); + } } return null; } @@ -439,7 +445,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private String getSecondaryCallProviderLabel() { PhoneAccount account = mSecondary.getAccount(); if (account != null) { - return getTelecommManager().getPhoneAccountMetadata(account).getLabel(); + PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account); + if (data != null) { + return data.getLabel(); + } } return null; } @@ -447,8 +456,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> private Drawable getSecondaryCallProviderIcon() { PhoneAccount account = mSecondary.getAccount(); if (account != null) { - return getTelecommManager().getPhoneAccountMetadata(account) - .getIcon(mContext); + PhoneAccountMetadata data = getTelecommManager().getPhoneAccountMetadata(account); + if (data != null) { + return data.getIcon(mContext); + } } return null; } |