commit ea342539910b59662ac45ebb69f4527da0e0090e
author Brad Ebinger <breadley@google.com> Fri Feb 22 22:05:39 2019 +0000
committer Brad Ebinger <breadley@google.com> Fri Feb 22 22:11:12 2019 +0000
tree 0d67f62a075b87ce8c0bbef5105d2ba5873efbd3
parent f165e4de31f54be05f917975f9908bcb6e5d4a9c

Revert "Fix conference call cannot be hung up"

This reverts commit f165e4de31f54be05f917975f9908bcb6e5d4a9c.

Reason for revert: caused b/123957741

Bug: 123957741
Test: manual - make conference call and swap
Change-Id: Id6b35654e75e67df1b5ccba909c585d2d58a5afa

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 3886e58..d2ba8f1 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.