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

Commit 5157ace5 authored by Steve Statia's avatar Steve Statia Committed by Android (Google) Code Review
Browse files

Merge "Add carrier config... 

Merge "Add carrier config KEY_CARRIER_ROAMING_NTN_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE_INT for handling handover to satellite 911" into main
parents 62ae5207 23aec5b5

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -43729,6 +43729,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";

telephony/java/android/telephony/CarrierConfigManager.java

+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.















     *










@@ -11209,6 +11226,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.putInt(KEY_SATELLITE_SCREEN_OFF_INACTIVITY_TIMEOUT_SEC_INT, 30);















        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");