summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hyosun Kim <hyosunkim@google.com> 2024-03-28 02:44:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-28 02:44:10 +0000
commitefcdfecc6afeaba3f4a155371625e2bb8e6b3cfe (patch)
tree4da48514d0e9b211c025b4fcef6c4c19c32362f5
parent62c0b66ece1a0c64339ea344736b8dceb2e1a27b (diff)
parent7fec47f8836ab6987aa8e36fd7d0d303f720c464 (diff)
Merge "Added carrier config for the appName that is used when querying the entitlement server for satellite." into 24D1-dev am: 7fec47f883
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26716027 Change-Id: I2cf93e731e5ee3ef19d1a68eecf061be12bd9e46 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index df32fbd2e58d..ed3d5d546f72 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -9854,6 +9854,19 @@ public class CarrierConfigManager {
"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);