diff options
author | Andrew Lee <anwlee@google.com> | 2014-08-26 19:17:43 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-26 19:17:43 +0000 |
commit | 677b93933325b6ba617a765faffe76519504daeb (patch) | |
tree | d51ff3f74d27309b8d634f7a6beaa0e0c5906cf3 /InCallUI | |
parent | 872f5dd09e1753f900da9833ac64eaac632d951e (diff) | |
parent | e16e53167b367656840df665457e71e66bc966de (diff) |
Merge "Null protect maybeShowConferenceCallButton." into lmp-dev
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index b746267e8..c37aaec73 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -299,6 +299,11 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> * buttons in the {@link CallButtonFragment}. */ private void maybeShowManageConferenceCallButton() { + if (mPrimary == null) { + getUi().showManageConferenceCallButton(false); + return; + } + final boolean isGenericConference = mPrimary.can(PhoneCapabilities.GENERIC_CONFERENCE); getUi().showManageConferenceCallButton(mPrimary.isConferenceCall() && !isGenericConference); } |