Merge "Null protect maybeShowConferenceCallButton." into lmp-dev

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);
     }