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

Commit 9f2c10be authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allow carriers to bypass data roaming for Satellite" into main

parents 150c48e4 8f708822

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45059,6 +45059,7 @@ package android.telephony { 
    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT = "satellite_entitlement_status_refresh_days_int";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") public static final String KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL = "satellite_entitlement_supported_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ESOS_SUPPORTED_BOOL = "satellite_esos_supported_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.satellite_25q4_apis") public static final String KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL = "satellite_ignore_data_roaming_setting_bool";

    field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING = "satellite_information_redirect_url_string";

    field @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static final String KEY_SATELLITE_NIDD_APN_NAME_STRING = "satellite_nidd_apn_name_string";

    field @FlaggedApi("com.android.internal.telephony.flags.carrier_roaming_nb_iot_ntn") public static final String KEY_SATELLITE_ROAMING_ESOS_INACTIVITY_TIMEOUT_SEC_INT = "satellite_roaming_esos_inactivity_timeout_sec_int";

telephony/java/android/telephony/CarrierConfigManager.java

+14 −0
Original line number Diff line number Diff line
@@ -9987,6 +9987,19 @@ public class CarrierConfigManager { 
    public static final String KEY_SATELLITE_DATA_SUPPORT_MODE_INT =

            "satellite_data_support_mode_int";













    /**













     * Determines whether data roaming off setting should be ignored and satellite data should be













     * allowed even when data roaming is off.













     *













     * If the carrier would like to allow the device to use satellite connection when data roaming













     * is off, this key should be set to {@code true}.













     *













     * The default value is {@code false} i.e. disallow satellite data when data roaming is off.













     */













    @FlaggedApi(Flags.FLAG_SATELLITE_25Q4_APIS)













    public static final String KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL =













        "satellite_ignore_data_roaming_setting_bool";



























    /**















     * Determine whether to override roaming Wi-Fi Calling preference when device is connected to















     * non-terrestrial network.










@@ -11388,6 +11401,7 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL, true);















        sDefaults.putInt(KEY_SATELLITE_DATA_SUPPORT_MODE_INT,















                CarrierConfigManager.SATELLITE_DATA_SUPPORT_ONLY_RESTRICTED);













        sDefaults.putBoolean(KEY_SATELLITE_IGNORE_DATA_ROAMING_SETTING_BOOL, false);















        sDefaults.putBoolean(KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL, true);















        sDefaults.putInt(KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT, 7);















        sDefaults.putBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);