diff options
| -rw-r--r-- | core/res/res/values/config.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 | ||||
| -rwxr-xr-x | telephony/java/android/telephony/CarrierConfigManager.java | 22 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/DctConstants.java | 3 |
4 files changed, 32 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 6ca50811115e..68c86b263a75 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2460,6 +2460,12 @@ 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> + <!-- 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: diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 85c2a2a24749..1c9e2cd72f28 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -473,6 +473,7 @@ <java-symbol type="integer" name="config_num_physical_slots" /> <java-symbol type="array" name="config_integrityRuleProviderPackages" /> <java-symbol type="bool" name="config_useAssistantVolume" /> + <java-symbol type="string" name="config_bandwidthEstimateSource" /> <java-symbol type="color" name="tab_indicator_text_v4" /> diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index b1acfe91341a..a7e52ea21758 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2481,6 +2481,21 @@ public class CarrierConfigManager { "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 */ @@ -3955,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); diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index 1449a62fbf35..f61d4e14f1d3 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -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"; } |