1 files changed, 9 insertions, 9 deletions
diff --git a/src/com/android/car/dialer/ui/activecall/OngoingCallFragment.java b/src/com/android/car/dialer/ui/activecall/OngoingCallFragment.java
index c7421521..0bb0c99c 100644
--- a/src/com/android/car/dialer/ui/activecall/OngoingCallFragment.java
+++ b/src/com/android/car/dialer/ui/activecall/OngoingCallFragment.java
@@ -17,7 +17,6 @@
 package com.android.car.dialer.ui.activecall;
 
 import android.os.Bundle;
-import android.telecom.Call;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -58,11 +57,8 @@ public class OngoingCallFragment extends InCallFragment {
 
         inCallViewModel.getPrimaryCallDetail().observe(this, this::bindUserProfileView);
         inCallViewModel.getCallStateAndConnectTime().observe(this, this::updateCallDescription);
-        inCallViewModel.getSecondaryCall().observe(this, this::maybeShowOnholdCallFragment);
 
-        OngoingCallStateViewModel ongoingCallStateViewModel = ViewModelProviders.of(
-                getActivity()).get(OngoingCallStateViewModel.class);
-        mDialpadState = ongoingCallStateViewModel.getDialpadState();
+        mDialpadState = inCallViewModel.getDialpadOpenState();
         mDialpadState.setValue(savedInstanceState == null ? false : !mDialpadFragment.isHidden());
         mDialpadState.observe(this, isDialpadOpen -> {
             if (isDialpadOpen) {
@@ -71,6 +67,10 @@ public class OngoingCallFragment extends InCallFragment {
                 onCloseDialpad();
             }
         });
+
+        inCallViewModel.shouldShowOnholdCall().observe(this,
+                this::maybeShowOnholdCallFragment);
+
         return fragmentView;
     }
 
@@ -92,11 +92,11 @@ public class OngoingCallFragment extends InCallFragment {
         mBackgroundImage.setDimmed(false);
     }
 
-    private void maybeShowOnholdCallFragment(@Nullable Call secondaryCall) {
-        if (secondaryCall == null || secondaryCall.getState() != Call.STATE_HOLDING) {
-            getChildFragmentManager().beginTransaction().hide(mOnholdCallFragment).commit();
-        } else {
+    private void maybeShowOnholdCallFragment(Boolean showOnholdCall) {
+        if (showOnholdCall) {
             getChildFragmentManager().beginTransaction().show(mOnholdCallFragment).commit();
+        } else {
+            getChildFragmentManager().beginTransaction().hide(mOnholdCallFragment).commit();
         }
     }
 }