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

Commit 5c11d472 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Used single TCP configuration for devices" am: 71649aa3 

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

Change-Id: Ice8309b8975907bf3ddd2c01da8cea291125a52d
parents 99635324 71649aa3

core/res/res/values/config.xml

+17 −0
Original line number Diff line number Diff line
@@ -2565,10 +2565,27 @@ 
    <!-- Configure mobile tcp buffer sizes in the form:

         rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max

         If no value is found for the rat-name in use, the system default will be applied.



         This is deprecated. Please use config_tcp_buffers.

    -->

    <string-array name="config_mobile_tcp_buffers">

    </string-array>



    <!-- Configure tcp buffer sizes in the form:

         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max

         If this is configured as an empty string, the system default will be applied.



         For now this config is used by mobile data only. In the future it should be

         used by Wi-Fi as well.



         Note that starting from Android 13, the TCP buffer size is fixed after boot up, and should

         never be changed based on carriers or the network types. The value should be configured

         appropriately based on the device's memory and performance. It is recommended to use lower

         values if the device has low memory or doesn't support high-speed network such like LTE,

         NR, or Wifi.

    -->

    <string name="config_tcp_buffers" translatable="false"></string>



    <!-- Configure ethernet tcp buffersizes in the form:

         rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max -->

    <string name="config_ethernet_tcp_buffers" translatable="false">524288,1048576,3145728,524288,1048576,2097152</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ 
  <java-symbol type="integer" name="config_safe_media_volume_usb_mB" />

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

  <java-symbol type="array"   name="config_mobile_tcp_buffers" />

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

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

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

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

telephony/java/android/telephony/CarrierConfigManager.java

+0 −35
Original line number Diff line number Diff line
@@ -2937,19 +2937,6 @@ public class CarrierConfigManager { 
    public static final String KEY_SIGNAL_STRENGTH_NR_NSA_USE_LTE_AS_PRIMARY_BOOL =

            "signal_strength_nr_nsa_use_lte_as_primary_bool";



    /**

     * String array of TCP buffer sizes per network type.

     * The entries should be of the following form, with values in bytes:

     * "network_name:read_min,read_default,read_max,write_min,write_default,write_max".

     * For NR (5G), the following network names should be used:

     * - NR_NSA: NR NSA, sub-6 frequencies

     * - NR_NSA_MMWAVE: NR NSA, mmwave frequencies

     * - NR_SA: NR SA, sub-6 frequencies

     * - NR_SA_MMWAVE: NR SA, mmwave frequencies

     * @hide

     */

    public static final String KEY_TCP_BUFFERS_STRING_ARRAY = "tcp_buffers_string_array";



    /**

     * String array of default bandwidth values per network type.

     * The entries should be of form: "network_name:downlink,uplink", with values in Kbps.
@@ -6322,28 +6309,6 @@ public class CarrierConfigManager { 
                "iDEN:14,14", "LTE:30000,15000", "HSPA+:13000,3400", "GSM:24,24",

                "TD_SCDMA:115,115", "LTE_CA:30000,15000", "NR_NSA:47000,18000",

                "NR_NSA_MMWAVE:145000,60000", "NR_SA:145000,60000", "NR_SA_MMWAVE:145000,60000"});

        sDefaults.putStringArray(KEY_TCP_BUFFERS_STRING_ARRAY, new String[]{

                "GPRS:4092,8760,48000,4096,8760,48000", "EDGE:4093,26280,70800,4096,16384,70800",

                "UMTS:58254,349525,1048576,58254,349525,1048576",

                "CDMA:4094,87380,262144,4096,16384,262144",

                "1xRTT:16384,32768,131072,4096,16384,102400",

                "EvDo_0:4094,87380,262144,4096,16384,262144",

                "EvDo_A:4094,87380,262144,4096,16384,262144",

                "HSDPA:61167,367002,1101005,8738,52429,262114",

                "HSUPA:40778,244668,734003,16777,100663,301990",

                "HSPA:40778,244668,734003,16777,100663,301990",

                "EvDo_B:4094,87380,262144,4096,16384,262144",

                "eHRPD:131072,262144,1048576,4096,16384,524288",

                "iDEN:4094,87380,262144,4096,16384,262144",

                "LTE:524288,1048576,2097152,262144,524288,1048576",

                "HSPA+:122334,734003,2202010,32040,192239,576717",

                "GSM:4092,8760,48000,4096,8760,48000",

                "TD_SCDMA:58254,349525,1048576,58254,349525,1048576",

                "LTE_CA:4096,6291456,12582912,4096,1048576,2097152",

                "NR_NSA:2097152,6291456,16777216,512000,2097152,8388608",

                "NR_NSA_MMWAVE:2097152,6291456,16777216,512000,2097152,8388608",

                "NR_SA:2097152,6291456,16777216,512000,2097152,8388608",

                "NR_SA_MMWAVE:2097152,6291456,16777216,512000,2097152,8388608"});

        sDefaults.putBoolean(KEY_BANDWIDTH_NR_NSA_USE_LTE_VALUE_FOR_UPLINK_BOOL, false);

        sDefaults.putString(KEY_WCDMA_DEFAULT_SIGNAL_STRENGTH_MEASUREMENT_STRING, "rssi");

        sDefaults.putBoolean(KEY_CONFIG_SHOW_ORIG_DIAL_STRING_FOR_CDMA_BOOL, false);