From 653d62feddbf39b967611678ba2b1c3d8a1fb97e Mon Sep 17 00:00:00 2001
From: Kai Shi <kaishi@google.com>
Date: Sun, 14 Feb 2021 11:16:27 -0800
Subject: [PATCH] Change config_bandwidthEstimateSource to bandwidth_estimator

Change the default value of  config_bandwidthEstimateSource to
bandwidth_estimator.

Bug: 177942435
Bug: 176814680
Test: atest -c FrameworksTelephonyTests:com.android.internal.telephony
Test: manual test in 2G/3G/4G networks
Change-Id: I59c869334a6147879331c428baeb9625e0802f6e
---
 core/res/res/values/config.xml                             | 7 +++----
 .../java/com/android/internal/telephony/DctConstants.java  | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index b7c755ef7f6b3..386559fe0a248 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2507,10 +2507,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.
diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java
index 6fbde503c3a06..15d19a49ee564 100644
--- a/telephony/java/com/android/internal/telephony/DctConstants.java
+++ b/telephony/java/com/android/internal/telephony/DctConstants.java
@@ -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";