commit 0ea61d5655c2d0f8c934046f162036bb635645e4
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 15 01:17:26 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 15 01:17:26 2020 +0000
tree 93d9ea182f4966902e2f2a46e8146448e8ccbba4
parent b2030a46139b14ac989c9f83795bb25dfd9731af
parent 3e7a0141d7079679412df6200eda2d66635634ce

Merge "Disconnect ongoing conference call for emergency"

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.