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

Commit 363ce10f authored by Sangyun Yun's avatar Sangyun Yun Committed by Android (Google) Code Review
Browse files

Merge "Fix issue of triggering SOS handover for T911 calls" into main

parents e9e96366 d97c2560

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

+2 −4
Original line number Diff line number Diff line
@@ -673,7 +673,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;
@@ -681,10 +681,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();

        }