commit c9adcf542ed3563500bbd258fb6738dbc3ec5672
author Thomas Nguyen <tnd@google.com> Fri Oct 18 15:41:18 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 18 15:41:18 2024 +0000
tree 5555bbf4c154bd01db0de33432cbe05edb28497a
parent e6cddebbb9c7eac2b3a8bf28fcab76ac609b53c5
parent 42c5af4a937ec1c0a4e3e678e2ce8fca49759245

Merge "Use getSelectedSatelliteSubId() instead of getSatellitePhone().getSubId()" into main

src/com/android/phone/EmergencyCallbackModeExitDialog.java

diff --git a/src/com/android/phone/EmergencyCallbackModeExitDialog.java b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
index 6901789..6918d48 100644
--- a/src/com/android/phone/EmergencyCallbackModeExitDialog.java
+++ b/src/com/android/phone/EmergencyCallbackModeExitDialog.java
@@ -252,7 +252,8 @@
                                     if (DomainSelectionResolver.getInstance()
                                             .isDomainSelectionSupported()) {
                                         EmergencyStateTracker.getInstance()
-                                                .exitEmergencyCallbackMode();
+                                                .exitEmergencyCallbackMode(
+                                                        TelephonyManager.STOP_REASON_USER_ACTION);
                                     } else {
                                         mPhone.exitEmergencyCallbackMode();
                                     }

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 0433a33..149e1c2 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -566,7 +566,8 @@
                 // Initialize EmergencyStateTracker if domain selection is supported
                 boolean isSuplDdsSwitchRequiredForEmergencyCall = getResources()
                         .getBoolean(R.bool.config_gnss_supl_requires_default_data_for_emergency);
-                EmergencyStateTracker.make(this, isSuplDdsSwitchRequiredForEmergencyCall);
+                EmergencyStateTracker.make(this, isSuplDdsSwitchRequiredForEmergencyCall,
+                        mFeatureFlags);
                 DynamicRoutingController.getInstance().initialize(this);
             }