commit 5da48e01464e6856c5a6c047aa062056e7b999e0
author Sungjae <sung_jae.kim@samsung.com> Tue Jan 14 17:18:47 2020 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 14 17:18:47 2020 -0800
tree 93d9ea182f4966902e2f2a46e8146448e8ccbba4
parent ce92504a0ceb73bbdf2068b0575c221b563f871d
parent 0ea61d5655c2d0f8c934046f162036bb635645e4

Merge "Disconnect ongoing conference call for emergency"
am: 0ea61d5655

Change-Id: Ie291601b1a7dceff3d70b556c81583114d6b08c3

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

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 2aba682..bac4793 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1471,6 +1471,12 @@
                                                     .OUTGOING_EMERGENCY_CALL_PLACED);
                                 }
                             }
+                            for (Conference c : getAllConferences()) {
+                                if (c.getState() != Connection.STATE_DISCONNECTED
+                                        && c instanceof Conference) {
+                                    ((Conference) c).onDisconnect();
+                                }
+                            }
                         } else if (!isVideoCallHoldAllowed(phone)) {
                             // If we do not support holding ongoing video call for an outgoing
                             // emergency call, disconnect the ongoing video call.