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

Commit 23aec5b5 authored by Steve Statia's avatar Steve Statia
Browse files

Add carrier config KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT

for handling handover to satellite 911

Flag: com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn

Test: Test: manual, cts: atest CarrierConfigManagerTest
Bug: 350397936
Change-Id: I1ee8a1fdf4653cea288cf68fda559f0c33a98b45
parent e02cd99c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -43728,6 +43728,7 @@ package android.telephony {
    field public static final String KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY = "carrier_nr_availabilities_int_array";
    field public static final String KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL = "carrier_provisions_wifi_merged_networks_bool";
    field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";
    field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT = "carrier_roaming_ntn_emergency_call_to_satellite_handover_type_int";
    field public static final String KEY_CARRIER_SERVICE_NAME_STRING_ARRAY = "carrier_service_name_array";
    field public static final String KEY_CARRIER_SERVICE_NUMBER_STRING_ARRAY = "carrier_service_number_array";
    field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";
+19 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.telephony.ims.MediaQualityStatus;
import android.telephony.ims.RcsUceAdapter;
import android.telephony.ims.feature.MmTelFeature;
import android.telephony.ims.feature.RcsFeature;
import android.telephony.satellite.SatelliteManager;
import com.android.internal.telephony.ICarrierConfigLoader;
import com.android.internal.telephony.flags.Flags;
@@ -10021,6 +10022,22 @@ public class CarrierConfigManager {
    public static final String KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT =
            "carrier_roaming_ntn_connect_type_int";
    /**
     * Indicates carrier roaming non-terrestrial network emergency call handover type that the
     * device will use to perform a handover between ESOS or T911.
     * If this key is set to {@link SatelliteManager#EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_SOS}
     * then the handover will be made to ESOS. If this key is set to
     * {@link SatelliteManager#EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911} then the handover
     * will be made to T911.
     *
     * The default value is {@link SatelliteManager#EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911}.
     *
     */
    @FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)
    public static final String
            KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT =
            "carrier_roaming_ntn_emergency_call_to_satellite_handover_type_int";
    /**
     * The carrier roaming non-terrestrial network hysteresis time in seconds.
     *
@@ -11196,6 +11213,8 @@ public class CarrierConfigManager {
                (int) TimeUnit.SECONDS.toMillis(30));
        sDefaults.putBoolean(KEY_SATELLITE_ESOS_SUPPORTED_BOOL, false);
        sDefaults.putInt(KEY_CARRIER_ROAMING_NTN_CONNECT_TYPE_INT, 0);
        sDefaults.putInt(KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT,
                SatelliteManager.EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_T911);
        sDefaults.putInt(KEY_CARRIER_SUPPORTED_SATELLITE_NOTIFICATION_HYSTERESIS_SEC_INT, 180);
        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
        sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);