commit 559cb22211f49ee66dd8f5382eaefffef855da82
author Andrew Lee <anwlee@google.com> Tue Aug 26 10:13:33 2014 -0700
committer The Android Automerger <android-build@google.com> Tue Aug 26 14:54:53 2014 -0700
tree 02bac7f51ab918fe7a66aa6728b2722033c0e3da
parent 6f5ca42e12fa37e37e7a6a2a5475594e4f2193c5

Null protect maybeShowConferenceCallButton.

Bug: 17274805
Change-Id: Id25b325e9d59b63632eb55c514af409555707b9d

src/com/android/incallui/CallCardPresenter.java

diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java
index b746267..c37aaec 100644
--- a/src/com/android/incallui/CallCardPresenter.java
+++ b/src/com/android/incallui/CallCardPresenter.java
@@ -299,6 +299,11 @@
      * 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);
     }