commit 11dc74e1e1adff138cd1b728fd919819d51814a1
author Brad Ebinger <breadley@google.com> Mon Feb 25 21:25:31 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 21:25:31 2019 -0800
tree 4124966347cd5025fc444645cfbadff57ce21960
parent 9c54a53e8c8f5cd15689d4de8969020fb0474720
parent d4f012adfdfa453738781294fb56bcd4232eff81

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

Change-Id: I6b00bca2556dbb64e47737353262118104347136

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.