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

Commit 0051e657 authored by Hakjun Choi's avatar Hakjun Choi Committed by Automerger Merge Worker
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 am: f55eb466

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26682671



Change-Id: I5bb32df908fadfde05367c145bf3853863d339c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de5b53d6 f55eb466

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -9889,6 +9889,16 @@ public class CarrierConfigManager { 
    public static final String KEY_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,















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










@@ -11034,6 +11044,7 @@ public class CarrierConfigManager {













        sDefaults.putInt(KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT, 7);















        sDefaults.putBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);















        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.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");















        sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);