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

Commit c8259c17 authored by Sarah Chin's avatar Sarah Chin Committed by Jack Yu
Browse files

Add carrier config to include LTE bands when calculating NR advaanced threshold 

Test: atest NetworkTypeControllerTest
Bug: 260052715
Change-Id: I71f989d5dcff9d5f7d3fd11c87fbce68b1484b50
parent 23f5fbe9

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41864,6 +41864,7 @@ package android.telephony { 
    field public static final String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool";

    field public static final String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int";

    field public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int";

    field public static final String KEY_INCLUDE_LTE_FOR_NR_ADVANCED_THRESHOLD_BANDWIDTH_BOOL = "include_lte_for_nr_advanced_threshold_bandwidth_bool";

    field public static final String KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL = "is_ims_conference_size_enforced_bool";

    field public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL = "is_opportunistic_subscription_bool";

    field public static final String KEY_LTE_ENABLED_BOOL = "lte_enabled_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1995,6 +1995,15 @@ public class CarrierConfigManager { 
    public static final String KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT =

            "nr_advanced_threshold_bandwidth_khz_int";



    /**

     * Indicating whether to include LTE cell bandwidths when determining whether the aggregated

     * cell bandwidth meets the required threshold for NR advanced.

     *

     * @see TelephonyDisplayInfo#OVERRIDE_NETWORK_TYPE_NR_ADVANCED

     */

    public static final String KEY_INCLUDE_LTE_FOR_NR_ADVANCED_THRESHOLD_BANDWIDTH_BOOL =

            "include_lte_for_nr_advanced_threshold_bandwidth_bool";



    /**

     * Boolean indicating if operator name should be shown in the status bar

     * @hide
@@ -9577,6 +9586,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_HIDE_LTE_PLUS_DATA_ICON_BOOL, true);

        sDefaults.putInt(KEY_LTE_PLUS_THRESHOLD_BANDWIDTH_KHZ_INT, 20000);

        sDefaults.putInt(KEY_NR_ADVANCED_THRESHOLD_BANDWIDTH_KHZ_INT, 0);

        sDefaults.putBoolean(KEY_INCLUDE_LTE_FOR_NR_ADVANCED_THRESHOLD_BANDWIDTH_BOOL, false);

        sDefaults.putIntArray(KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,

                new int[]{CARRIER_NR_AVAILABILITY_NSA, CARRIER_NR_AVAILABILITY_SA});

        sDefaults.putBoolean(KEY_LTE_ENABLED_BOOL, true);