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

Commit efcdfecc authored by Hyosun Kim's avatar Hyosun Kim Committed by Automerger Merge Worker
Browse files

Merge "Added carrier config for the appName that is used when querying the... 

Merge "Added carrier config for the appName that is used when querying the entitlement server for satellite." into 24D1-dev am: 7fec47f8

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



Change-Id: I2cf93e731e5ee3ef19d1a68eecf061be12bd9e46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62c0b66e 7fec47f8

telephony/java/android/telephony/CarrierConfigManager.java

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

            "satellite_entitlement_supported_bool";













    /**













     * Indicates the appName that is used when querying the entitlement server for satellite.













     *













     * The default value is androidSatmode.













     *













     * Reference: GSMA TS.43-v11, 2.8.5 Fast Authentication and Token Management.













     * `app_name` is an optional attribute in the request and may vary depending on the carrier













     * requirement.













     * @hide













     */













    public static final String KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING =













            "satellite_entitlement_app_name_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.










@@ -10997,6 +11010,7 @@ public class CarrierConfigManager {













        sDefaults.putBoolean(KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL, true);















        sDefaults.putInt(KEY_SATELLITE_ENTITLEMENT_STATUS_REFRESH_DAYS_INT, 30);















        sDefaults.putBoolean(KEY_SATELLITE_ENTITLEMENT_SUPPORTED_BOOL, false);













        sDefaults.putString(KEY_SATELLITE_ENTITLEMENT_APP_NAME_STRING, "androidSatmode");















        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);