3 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/incallui/AnswerFragment.java b/src/com/android/incallui/AnswerFragment.java
index 4302920d..93573459 100644
--- a/src/com/android/incallui/AnswerFragment.java
+++ b/src/com/android/incallui/AnswerFragment.java
@@ -104,6 +104,9 @@ public class AnswerFragment extends BaseFragment<AnswerPresenter, AnswerPresente
 
     @Override
     public void showAnswerUi(boolean show) {
+        if (show && getActivity() != null && getActivity() instanceof InCallActivity) {
+            ((InCallActivity) getActivity()).displayManageConferencePanel(false);
+        }
         getView().setVisibility(show ? View.VISIBLE : View.GONE);
 
         Log.d(this, "Show answer UI: " + show);
diff --git a/src/com/android/incallui/InCallActivity.java b/src/com/android/incallui/InCallActivity.java
index d0589181..febe634c 100644
--- a/src/com/android/incallui/InCallActivity.java
+++ b/src/com/android/incallui/InCallActivity.java
@@ -600,6 +600,8 @@ public class InCallActivity extends Activity {
             mConferenceManagerFragment.setVisible(true);
             mConferenceManagerShown = true;
             updateSystemBarTranslucency();
+        } else {
+            mConferenceManagerFragment.setVisible(false);
         }
     }
 
diff --git a/src/com/android/incallui/MSimAnswerFragment.java b/src/com/android/incallui/MSimAnswerFragment.java
index 7621f907..e3077e0b 100644
--- a/src/com/android/incallui/MSimAnswerFragment.java
+++ b/src/com/android/incallui/MSimAnswerFragment.java
@@ -102,6 +102,9 @@ public class MSimAnswerFragment extends BaseFragment<MSimAnswerPresenter,
 
     @Override
     public void showAnswerUi(boolean show) {
+        if (show && getActivity() != null && getActivity() instanceof MSimInCallActivity) {
+            ((MSimInCallActivity) getActivity()).displayManageConferencePanel(false);
+        }
         getView().setVisibility(show ? View.VISIBLE : View.GONE);
 
         Log.d(this, "Show answer UI: " + show);