commit d97c2560e9309217ec8cf9231456da87f2dfb3f4
author Sangyun Yun <sangyun@google.com> Wed Dec 04 02:59:41 2024 +0000
committer Sangyun Yun <sangyun@google.com> Wed Dec 04 02:59:41 2024 +0000
tree 2032540bc66dba67721f90a1be989d2d95cf09a0
parent 0f28e0d3fe86d8ba3674156eb7c31242b0cadd40

Fix issue of triggering SOS handover for T911 calls

Adding the missing provision checks to ensure T911
handover is only triggered when provisioning enabled
and has allowed reasons

Bug: 382116001
Test: Manally tested Satellite
FLAG: EXEMPT bugfix
Change-Id: I16007d388d0aeb616b00740bd9099bfe354eccca

src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java

diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
index 64bd2b7..490ee2d 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
@@ -671,7 +671,7 @@
 
     @NonNull private Bundle createExtraBundleForEventDisplayEmergencyMessage(
             boolean isTestEmergencyNumber) {
-        int handoverType = EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_SOS;
+        int handoverType = getEmergencyCallToSatelliteHandoverType();
         Pair<String, String> oemSatelliteMessagingApp =
                 getOemEnabledSatelliteHandoverAppFromOverlayConfig(mContext);
         String packageName = oemSatelliteMessagingApp.first;
@@ -679,10 +679,8 @@
         String action = getSatelliteEmergencyHandoverIntentActionFromOverlayConfig(mContext,
                 isTestEmergencyNumber);
 
-        if (isSatelliteConnectedViaCarrierWithinHysteresisTime()
-                || isEmergencyCallToSatelliteHandoverTypeT911Enforced()) {
+        if (handoverType == EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911) {
             ComponentName defaultSmsAppComponent = getDefaultSmsApp();
-            handoverType = EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911;
             packageName = defaultSmsAppComponent.getPackageName();
             className = defaultSmsAppComponent.getClassName();
         }