commit 2c23e58742e82f460eb3509bb90aeed8abd917c8
author The Android Automerger <android-build@google.com> Thu Apr 07 00:04:10 2016 -0700
committer The Android Automerger <android-build@google.com> Thu Apr 07 00:04:10 2016 -0700
tree edcb65e7362036aa3c8e5e969e39996de82e37cb
parent 84a1becf7d9a7055f16fc5b0e503e0512dcdfcf1
parent 8331d0d4004305afc4cce7b6e035bf6b1c3c89cf

merge in nyc-release history after reset to nyc-dev

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 00835c8..3e3926b 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -486,7 +486,7 @@
         }
 
         return mPrimary.can(android.telecom.Call.Details.CAPABILITY_MANAGE_CONFERENCE)
-                && !mPrimary.isVideoCall(mContext);
+                && !mIsFullscreen;
     }
 
     private void setCallbackNumber() {
@@ -1023,6 +1023,7 @@
         }
         ui.setCallCardVisible(!isFullscreenMode);
         ui.setSecondaryInfoVisible(!isFullscreenMode);
+        maybeShowManageConferenceCallButton();
     }
 
     @Override