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

Commit b4c19050 authored by Kai Shi's avatar Kai Shi Committed by Automerger Merge Worker
Browse files

Merge "Change config_bandwidthEstimateSource to bandwidth_estimator" into sc-dev am: 0aa410fe 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I754e645cd2cc25b4f5bf45451d64ef3f471a61e9
parents 3f4a9c7e 0aa410fe

core/res/res/values/config.xml

+3 −4
Original line number Diff line number Diff line
@@ -2511,10 +2511,9 @@ 
    <string name="config_ethernet_tcp_buffers" translatable="false">524288,1048576,3145728,524288,1048576,2097152</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>

         Default is bandwidth_estimator.

         Values are bandwidth_estimator, carrier_config and modem. -->

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



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

         There are many prerequisites for this feature to work correctly.

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

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ public class DctConstants { 
    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";

    public static final String BANDWIDTH_SOURCE_BANDWIDTH_ESTIMATOR_KEY = "bandwidth_estimator";

    public static final String RAT_NAME_LTE = "LTE";

    public static final String RAT_NAME_NR_NSA = "NR_NSA";

    public static final String RAT_NAME_NR_NSA_MMWAVE = "NR_NSA_MMWAVE";