Add build config values for data use defaults
Don't use hard coded defaults - use build configs instead.
Iface is now ONLY set by config so gservices doesn't need to.
bug:2576057
Change-Id: I8f9e3bc51af3b1cdf8bb4290a43197d9c01e2a14
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index e640005..e8c09b0 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3306,13 +3306,13 @@
* The bandwidth throttle threshold (long)
* @hide
*/
- public static final String THROTTLE_THRESHOLD = "throttle_threshold";
+ public static final String THROTTLE_THRESHOLD_BYTES = "throttle_threshold_bytes";
/**
* The bandwidth throttle value (kbps)
* @hide
*/
- public static final String THROTTLE_VALUE = "throttle_value";
+ public static final String THROTTLE_VALUE_KBITSPS = "throttle_value_kbitsps";
/**
* The bandwidth throttle reset calendar day (1-28)
@@ -3327,12 +3327,6 @@
public static final String THROTTLE_NOTIFICATION_TYPE = "throttle_notification_type";
/**
- * The interface we throttle
- * @hide
- */
- public static final String THROTTLE_IFACE = "throttle_iface";
-
- /**
* Help URI for data throttling policy
* @hide
*/
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 7ebbab0..64f05fe 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -290,4 +290,21 @@
<!-- Boolean indicating if current platform supports bluetooth SCO for off call
use cases -->
<bool name="config_bluetooth_sco_off_call">true</bool>
+
+ <!-- The default data-use polling period. -->
+ <integer name="config_datause_polling_period_sec">600</integer>
+
+ <!-- The default data-use threshold in bytes. 0 disables-->
+ <integer name="config_datause_threshold_bytes">0</integer>
+
+ <!-- The default reduced-datarate value in kilobits per sec -->
+ <integer name="config_datause_throttle_kbitsps">300</integer>
+
+ <!-- The default iface on which to monitor data use -->
+ <string name="config_datause_iface">rmnet0</string>
+
+ <!-- The default reduced-datarate notification mask -->
+ <!-- 2 means give warning -->
+ <integer name="config_datause_notification_type">2</integer>
+
</resources>