commit 63db8bffa9ae990f5bd02ca2ad11920cf13189ab
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 15 01:32:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 15 01:32:28 2020 +0000
tree 93d9ea182f4966902e2f2a46e8146448e8ccbba4
parent 257092e06df2a48c58b530a7e4987a15bb92b089
parent 5da48e01464e6856c5a6c047aa062056e7b999e0

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

Change-Id: Id15e146e15d0234fd828e4a15740ae19b75345b7

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.