Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d97c2560 authored by Sangyun Yun's avatar Sangyun Yun
Browse files

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
parent 0f28e0d3

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

+2 −4
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ public class SatelliteSOSMessageRecommender extends Handler { 


    @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 @@ public class SatelliteSOSMessageRecommender extends Handler { 
        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();

        }