commit 2980ac0a46d09677c8d08aee634e3032350f7854
author yongnamcha <yongnamcha@google.com> Fri Oct 11 05:13:52 2024 +0000
committer yongnamcha <yongnamcha@google.com> Wed Oct 16 13:30:59 2024 +0000
tree fdf82d3d14f50733bfe7d57a35829649e11d6c55
parent 0c68f39aa521510006666e75c527b8214aee7972

Add reason to exit the emergency callback mode

This commit adds reason to exit the emergency callback mode.
- reason: TelephonyManager.STOP_REASON_USER_ACTION
Plus, The EmergencyStateTracker.make method is called with FeatureFlags
provided as an argument.

Bug: 359064059
Test: atest
Flag: com.android.internal.telephony.flags.emergency_callback_mode_notification
Change-Id: Id6f57737b97cde125ff7213a356df4693eede780

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);
             }