commit e91feb45631450fb4bfb13cf8a704d3ee886828e
author Daniel Banta <danielbanta@google.com> Fri Dec 23 06:37:53 2022 +0000
committer Daniel Banta <danielbanta@google.com> Sat Dec 31 00:34:51 2022 +0000
tree 42e4fbcff38fed7e5462eb8d9f6c1205b7651d7a
parent 4443a24ecc2fce9ef339aef84910b0990e041e04

[EmergencyStateTracker] Redirect exitEmergencyCallbackMode to EmergencyStateTracker if Domain Selection enabled when user taps ECM pop-up

Bug: 247639718
Change-Id: I76a1211044f8820deb1a79b707d878ee027d9954

src/com/android/phone/EmergencyCallbackModeExitDialog.java

diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
index fc0e513..6901789 100644
--- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java
+++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
@@ -43,6 +43,8 @@
 
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.TelephonyIntents;
+import com.android.internal.telephony.domainselection.DomainSelectionResolver;
+import com.android.internal.telephony.emergency.EmergencyStateTracker;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -244,9 +246,16 @@
                     .setMessage(text)
                     .setPositiveButton(R.string.alert_dialog_yes,
                             new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog,int whichButton) {
+                                public void onClick(DialogInterface dialog,
+                                        int whichButton) {
                                     // User clicked Yes. Exit Emergency Callback Mode.
-                                    mPhone.exitEmergencyCallbackMode();
+                                    if (DomainSelectionResolver.getInstance()
+                                            .isDomainSelectionSupported()) {
+                                        EmergencyStateTracker.getInstance()
+                                                .exitEmergencyCallbackMode();
+                                    } else {
+                                        mPhone.exitEmergencyCallbackMode();
+                                    }
 
                                     // Show progress dialog
                                     showDialog(EXIT_ECM_PROGRESS_DIALOG);