commit d4f012adfdfa453738781294fb56bcd4232eff81
author Brad Ebinger <breadley@google.com> Mon Feb 25 20:29:20 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 20:29:20 2019 -0800
tree 0b01d32d91e29fb0d32697e2296bfd36cc40131f
parent ba157e08bb36629f8ed4aa94f45c65e8aa196119
parent d0d3f84b5dd44c878018729edcdb2e83378b0179

Merge "Revert "Fix conference call cannot be hung up"" am: df83f91e60
am: d0d3f84b5d

Change-Id: I8cb3bfb88fb3085f72505b7b0872877eaef68e93

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index 85f0d48..7c09320 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -46,7 +46,6 @@
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.CallFailCause;
 import com.android.internal.telephony.CallStateException;
-import com.android.internal.telephony.Call.HoldingRequestState;
 import com.android.internal.telephony.Connection.Capability;
 import com.android.internal.telephony.Connection.PostDialListener;
 import com.android.internal.telephony.Phone;
@@ -953,7 +952,6 @@
                 // instead of actually putting it on hold.
                 if (ringingCall.getState() != Call.State.WAITING) {
                     phone.switchHoldingAndActive();
-                    mOriginalConnection.getCall().updateHoldingRequestState(HoldingRequestState.STARTED);
                 }
 
                 // TODO: Cdma calls are slightly different.