commit a8f8245aeff394778441cffa8a8913be61b0ce54
author Brad Ebinger <breadley@google.com> Thu Jan 31 22:05:54 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 31 22:05:54 2019 +0000
tree 68e0103083cfa3fc38a4c837c11264ac26587d0c
parent 10cc41124b1cff4f8ee2596196dfd18fbcc8f714
parent f165e4de31f54be05f917975f9908bcb6e5d4a9c

Merge "Fix conference call cannot be hung up"

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 d2ba8f1..3886e58 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -46,6 +46,7 @@
 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;
@@ -952,6 +953,7 @@
                 // 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.