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

Commit 5dc0d90a authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge changes from topics "ccm_bw", "ccm_unmetered" 

* changes:
  Carrier config for 5G up/down bandwidth and LTE for NSA
  Add carrier config for sub6/mmwave/all unmetered
parents d2b38018 f5d9be93

core/res/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -2596,6 +2596,12 @@ 
         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->

    <string name="config_wifi_tcp_buffers" translatable="false">524288,1048576,2097152,262144,524288,1048576</string>



    <!-- What source to use to estimate link upstream and downstream bandwidth capacities.

         Default is carrier_config, but it should be set to modem if the modem is returning

         predictive (instead of instantaneous) bandwidth estimate.

         Values are carrier_config and modem. -->

    <string name="config_bandwidthEstimateSource">carrier_config</string>



    <!-- Whether WiFi display is supported by this device.

         There are many prerequisites for this feature to work correctly.

         Here are a few of them:

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ 
  <java-symbol type="string" name="config_deviceSpecificDevicePolicyManagerService" />

  <java-symbol type="string" name="config_deviceSpecificAudioService" />

  <java-symbol type="integer" name="config_num_physical_slots" />

  <java-symbol type="string" name="config_bandwidthEstimateSource" />



  <java-symbol type="color" name="tab_indicator_text_v4" />

telephony/java/android/telephony/CarrierConfigManager.java

+54 −7
Original line number Diff line number Diff line
@@ -2461,6 +2461,21 @@ public class CarrierConfigManager { 
    public static final String KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT =

            "parameters_use_for_5g_nr_signal_bar_int";



    /**

     * String array of default bandwidth values per network type.

     * The entries should be of form "network_name:downstream,upstream", with values in Kbps.

     * @hide

     */

    public static final String KEY_BANDWIDTH_STRING_ARRAY = "bandwidth_string_array";



    /**

     * For NR (non-standalone), whether to use the LTE value instead of NR value as the default for

     * upstream bandwidth. Downstream bandwidth will still use the NR value as the default.

     * @hide

     */

    public static final String KEY_BANDWIDTH_NR_NSA_USE_LTE_VALUE_FOR_UPSTREAM_BOOL =

            "bandwidth_nr_nsa_use_lte_value_for_upstream_bool";



    /**

     * Key identifying if voice call barring notification is required to be shown to the user.

     * @hide
@@ -2963,6 +2978,33 @@ public class CarrierConfigManager { 
    public static final String KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT =

            "5g_icon_display_grace_period_sec_int";



    /**

     * Controls time in milliseconds until DcTracker reevaluates 5G connection state.

     */

    public static final String KEY_5G_WATCHDOG_TIME_MS_LONG = "5g_watchdog_time_long";



    /**

     * Whether NR (non-standalone) should be unmetered for all frequencies.

     * If either {@link #KEY_UNMETERED_NR_NSA_MMWAVE_BOOL} or

     * {@link #KEY_UNMETERED_NR_NSA_SUB6_BOOL} are true, then this value will be ignored.

     * @hide

     */

    public static final String KEY_UNMETERED_NR_NSA_BOOL = "unmetered_nr_nsa_bool";



    /**

     * Whether NR (non-standalone) frequencies above 6GHz (millimeter wave) should be unmetered.

     * If this is true, then the value for {@link #KEY_UNMETERED_NR_NSA_BOOL} will be ignored.

     * @hide

     */

    public static final String KEY_UNMETERED_NR_NSA_MMWAVE_BOOL = "unmetered_nr_nsa_mmwave_bool";



    /**

     * Whether NR (non-standalone) frequencies below 6GHz (sub6) should be unmetered.

     * If this is true, then the value for {@link #KEY_UNMETERED_NR_NSA_BOOL} will be ignored.

     * @hide

     */

    public static final String KEY_UNMETERED_NR_NSA_SUB6_BOOL = "unmetered_nr_nsa_sub6_bool";



    /**

     * Support ASCII 7-BIT encoding for long SMS. This carrier config is used to enable

     * this feature.
@@ -3041,11 +3083,6 @@ public class CarrierConfigManager { 
    public static final String KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL =

            "ping_test_before_data_switch_bool";



    /**

     * Controls time in milliseconds until DcTracker reevaluates 5G connection state.

     */

    public static final String KEY_5G_WATCHDOG_TIME_MS_LONG =

            "5g_watchdog_time_long";

    /**

     * Controls whether to switch data to primary from opportunistic subscription

     * if primary is out of service. This control only affects system or 1st party app
@@ -3933,6 +3970,13 @@ public class CarrierConfigManager { 
                });

        sDefaults.putInt(KEY_PARAMETERS_USE_FOR_5G_NR_SIGNAL_BAR_INT,

                CellSignalStrengthNr.USE_SSRSRP);

        sDefaults.putStringArray(KEY_BANDWIDTH_STRING_ARRAY, new String[]{

                "GPRS:24,24", "EDGE:70,18", "UMTS:115,115", "CDMA-IS95A:14,14", "CDMA-IS95B:14,14",

                "1xRTT:30,30", "EvDo-rev.0:750,48", "EvDo-rev.A:950,550", "HSDPA:4300,620",

                "HSUPA:4300,1800", "HSPA:4300,1800", "EvDo-rev.B:1500,550:", "eHRPD:750,48",

                "HSPAP:13000,3400", "TD-SCDMA:115,115", "LTE:30000,15000", "NR_NSA:47000,15000",

                "NR_NSA_MMWAVE:145000,15000", "NR_SA:145000,15000"});

        sDefaults.putBoolean(KEY_BANDWIDTH_NR_NSA_USE_LTE_VALUE_FOR_UPSTREAM_BOOL, false);

        sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, "rssi");

        sDefaults.putBoolean(KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_CALL_BLOCKING_DISABLED_NOTIFICATION_ALWAYS_BOOL, false);
@@ -3948,6 +3992,11 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_5G_ICON_CONFIGURATION_STRING,

                "connected_mmwave:5G,connected:5G");

        sDefaults.putInt(KEY_5G_ICON_DISPLAY_GRACE_PERIOD_SEC_INT, 0);

        /* Default value is 1 hour. */

        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_MMWAVE_BOOL, false);

        sDefaults.putBoolean(KEY_UNMETERED_NR_NSA_SUB6_BOOL, false);

        sDefaults.putBoolean(KEY_ASCII_7_BIT_SUPPORT_FOR_LONG_MESSAGE_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_WIFI_CALLING_ICON_IN_STATUS_BAR_BOOL, false);

        /* Default value is minimum RSRP level needed for SIGNAL_STRENGTH_GOOD */
@@ -3967,8 +4016,6 @@ public class CarrierConfigManager { 
        /* Default value is 3 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_DATA_SWITCH_EXIT_HYSTERESIS_TIME_LONG, 3000);

        sDefaults.putBoolean(KEY_PING_TEST_BEFORE_DATA_SWITCH_BOOL, true);

        /* Default value is 1 hour. */

        sDefaults.putLong(KEY_5G_WATCHDOG_TIME_MS_LONG, 3600000);

        sDefaults.putBoolean(KEY_SWITCH_DATA_TO_PRIMARY_IF_PRIMARY_IS_OOS_BOOL, true);

        /* Default value is 60 seconds. */

        sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_PING_PONG_TIME_LONG, 60000);

telephony/java/com/android/internal/telephony/DctConstants.java

+3 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ public class DctConstants { 
    public static final int EVENT_SERVICE_STATE_CHANGED = BASE + 52;

    public static final int EVENT_5G_TIMER_HYSTERESIS = BASE + 53;

    public static final int EVENT_5G_TIMER_WATCHDOG = BASE + 54;

    public static final int EVENT_UPDATE_CARRIER_CONFIGS = BASE + 55;



    /***** Constants *****/
@@ -123,4 +124,6 @@ public class DctConstants { 


    public static final String APN_TYPE_KEY = "apnType";

    public static final String PROVISIONING_URL_KEY = "provisioningUrl";

    public static final String BANDWIDTH_SOURCE_MODEM_KEY = "modem";

    public static final String BANDWIDTH_SOURCE_CARRIER_CONFIG_KEY = "carrier_config";

}