Add settings to configure default multipath quota.
Bug: 72631572
Test: Tests in go/ag/3828171 pass
Change-Id: I795debd0328ea7cad32c968cb4b407928e054528
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 70f343e..b4016ce 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9301,6 +9301,15 @@
"network_metered_multipath_preference";
/**
+ * Default daily multipath budget used by ConnectivityManager.getMultipathPreference()
+ * on metered networks. This default quota is only used if quota could not be determined
+ * from data plan or data limit/warning set by the user.
+ * @hide
+ */
+ public static final String NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES =
+ "network_default_daily_multipath_quota_bytes";
+
+ /**
* Network watchlist last report time.
* @hide
*/
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index a52a089..776f9a7 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -328,6 +328,13 @@
This is the default value of that setting. -->
<integer translatable="false" name="config_networkMeteredMultipathPreference">0</integer>
+ <!-- Default daily multipath budget used by ConnectivityManager.getMultipathPreference()
+ on metered networks. This default quota only used if quota could not be determined from
+ data plan or data limit/warning set by the user. The value that is actually used is
+ controlled by Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES. This is the
+ default value of that setting. -->
+ <integer translatable="false" name="config_networkDefaultDailyMultipathQuotaBytes">2500000</integer>
+
<!-- List of regexpressions describing the interface (if any) that represent tetherable
USB interfaces. If the device doesn't want to support tethering over USB this should
be empty. An example would be "usb.*" -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 03acd5c..ee7f8fb 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1914,6 +1914,7 @@
<java-symbol type="integer" name="config_networkWakeupPacketMask" />
<java-symbol type="bool" name="config_apfDrop802_3Frames" />
<java-symbol type="array" name="config_apfEthTypeBlackList" />
+ <java-symbol type="integer" name="config_networkDefaultDailyMultipathQuotaBytes" />
<java-symbol type="integer" name="config_networkMeteredMultipathPreference" />
<java-symbol type="integer" name="config_notificationsBatteryFullARGB" />
<java-symbol type="integer" name="config_notificationsBatteryLedOff" />
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 2a3fcad..7908ea9 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -300,6 +300,7 @@
Settings.Global.NETSTATS_UID_TAG_PERSIST_BYTES,
Settings.Global.NETSTATS_UID_TAG_ROTATE_AGE,
Settings.Global.NETWORK_AVOID_BAD_WIFI,
+ Settings.Global.NETWORK_DEFAULT_DAILY_MULTIPATH_QUOTA_BYTES,
Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE,
Settings.Global.NETWORK_WATCHLIST_LAST_REPORT_TIME,
Settings.Global.NETWORK_PREFERENCE,