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

Commit f55eb466 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Add a carrier config key to let satellite guidance URL link become... 

Merge "Add a carrier config key to let satellite guidance URL link become carrier configurable" into 24D1-dev
parents 924e9d20 72dd4e8f

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -9863,6 +9863,16 @@ public class CarrierConfigManager { 
    public static final String KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING =

    public static final String KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING =

            "satellite_entitlement_app_name_string";

            "satellite_entitlement_app_name_string";




















    /**














     * URL to redirect user to get more information about the carrier support for satellite.














     *














     * The default value is empty string.














     *














     * @hide














     */














    public static final String KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING =














            "satellite_information_redirect_url_string";
























    /**







    /**











     * Indicating whether DUN APN should be disabled when the device is roaming. In that case,







     * Indicating whether DUN APN should be disabled when the device is roaming. In that case,











     * the default APN (i.e. internet) will be used for tethering.







     * the default APN (i.e. internet) will be used for tethering.










@@ -10982,6 +10992,7 @@ public class CarrierConfigManager {









        sDefaults.putInt(KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT, 7);







        sDefaults.putInt(KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT, 7);











        sDefaults.putBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);







        sDefaults.putBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);











        sDefaults.putString(KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING, "androidSatmode");







        sDefaults.putString(KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING, "androidSatmode");














        sDefaults.putString(KEY_SATELLITE_INFORMATION_REDIRECT_URL_STRING, "");











        sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);







        sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);











        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");







        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");











        sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);







        sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);