Merge "Carrier config for opportunistic eSIM download only over WiFi" am: d54fb9484d am: badc5c5ef4

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

Change-Id: I13d9a513a437151a6a369fa124811ae9ba721f75
This commit is contained in:
Treehugger Robot
2022-02-12 06:49:07 +00:00
committed by Automerger Merge Worker

View File

@@ -3723,7 +3723,7 @@ public class CarrierConfigManager {
/** /**
* SMDP+ server address for downloading opportunistic eSIM profile. * SMDP+ server address for downloading opportunistic eSIM profile.
* FQDN (Fully Qualified Domain Name) of the SM-DP+ (e.g., smdp.gsma.com) restricted to the * FQDN (Fully Qualified Domain Name) of the SM-DP+ (e.g., smdp.gsma.com) restricted to the
* Alphanumeric mode character set defined in table 5 of ISO/IEC 18004 [15] excluding '$'. * Alphanumeric mode character set defined in table 5 of ISO/IEC 18004 excluding '$'.
*/ */
public static final String KEY_SMDP_SERVER_ADDRESS_STRING = public static final String KEY_SMDP_SERVER_ADDRESS_STRING =
"smdp_server_address_string"; "smdp_server_address_string";
@@ -3766,6 +3766,17 @@ public class CarrierConfigManager {
public static final String KEY_OPPORTUNISTIC_CARRIER_IDS_INT_ARRAY = public static final String KEY_OPPORTUNISTIC_CARRIER_IDS_INT_ARRAY =
"opportunistic_carrier_ids_int_array"; "opportunistic_carrier_ids_int_array";
/**
* Boolean configuration to control auto provisioning eSIM download in
* OpportunisticNetworkService using only WiFi or both WiFi/Data.
* True will download esim only via WiFi.
* False will use both WiFi and Data connection.
*
* @hide
*/
public static final String KEY_OPPORTUNISTIC_ESIM_DOWNLOAD_VIA_WIFI_ONLY_BOOL =
"opportunistic_esim_download_via_wifi_only_bool";
/** /**
* Controls RSRP threshold at which OpportunisticNetworkService will decide whether * Controls RSRP threshold at which OpportunisticNetworkService will decide whether
* the opportunistic network is good enough for internet data. * the opportunistic network is good enough for internet data.
@@ -5967,6 +5978,7 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_ESIM_MAX_DOWNLOAD_RETRY_ATTEMPTS_INT, 5); sDefaults.putInt(KEY_ESIM_MAX_DOWNLOAD_RETRY_ATTEMPTS_INT, 5);
sDefaults.putInt(KEY_ESIM_DOWNLOAD_RETRY_BACKOFF_TIMER_SEC_INT, 60); sDefaults.putInt(KEY_ESIM_DOWNLOAD_RETRY_BACKOFF_TIMER_SEC_INT, 60);
sDefaults.putIntArray(KEY_OPPORTUNISTIC_CARRIER_IDS_INT_ARRAY, new int[] {0}); sDefaults.putIntArray(KEY_OPPORTUNISTIC_CARRIER_IDS_INT_ARRAY, new int[] {0});
sDefaults.putBoolean(KEY_OPPORTUNISTIC_ESIM_DOWNLOAD_VIA_WIFI_ONLY_BOOL, false);
/* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */ /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */
sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT, -108); sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT, -108);
/* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_MODERATE */ /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_MODERATE */