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

Commit 8fa9512f authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Carrier config for opportunistic eSIM download only over WiFi"...

Merge "Merge "Carrier config for opportunistic eSIM download only over WiFi" am: d54fb948 am: badc5c5e am: 07fd16cd"
parents cc89d0bc ca973113
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -3796,7 +3796,7 @@ public class CarrierConfigManager {
    /**
     * 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
     * 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 =
            "smdp_server_address_string";
@@ -3839,6 +3839,17 @@ public class CarrierConfigManager {
    public static final String KEY_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
     * the opportunistic network is good enough for internet data.
@@ -8826,6 +8837,7 @@ public class CarrierConfigManager {
        sDefaults.putInt(KEY_ESIM_MAX_DOWNLOAD_RETRY_ATTEMPTS_INT, 5);
        sDefaults.putInt(KEY_ESIM_DOWNLOAD_RETRY_BACKOFF_TIMER_SEC_INT, 60);
        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 */
        sDefaults.putInt(KEY_OPPORTUNISTIC_NETWORK_ENTRY_THRESHOLD_RSRP_INT, -108);
        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_MODERATE */