summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-08-26 10:13:33 -0700
committerAndrew Lee <anwlee@google.com>2014-08-26 10:19:56 -0700
commite16e53167b367656840df665457e71e66bc966de (patch)
tree91cc3fca667c3f59179fc96d2818c7d276f626c7
parentadaaccdc6f9eb8d104da8f713d1ebb12d75de7a8 (diff)
Null protect maybeShowConferenceCallButton.
Bug: 17274805 Change-Id: Id25b325e9d59b63632eb55c514af409555707b9d
-rw-r--r--InCallUI/src/com/android/incallui/CallCardPresenter.java5
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);
}