summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-08-03 15:52:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-03 15:52:23 -0700
commitc7ad9fa08011be920f3636cb93bf75a0af13ea14 (patch)
tree7d218d1bad77cad59dd92c05a75b1f62d5f6b459 /core/java/android/provider
parent9d67668b9ba3284a16b1e6f6f8cca53e2172f8f6 (diff)
parent80782220708fdc8575502ac68c884ddab5c78ac2 (diff)
downloadframeworks_base-c7ad9fa08011be920f3636cb93bf75a0af13ea14.zip
frameworks_base-c7ad9fa08011be920f3636cb93bf75a0af13ea14.tar.gz
frameworks_base-c7ad9fa08011be920f3636cb93bf75a0af13ea14.tar.bz2
am 80782220: am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
Merge commit '80782220708fdc8575502ac68c884ddab5c78ac2' * commit '80782220708fdc8575502ac68c884ddab5c78ac2': New secure setting for mobile download size limit.
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a4f9f4e..6d3ca27 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3396,6 +3396,14 @@ public final class Settings {
public static final String THROTTLE_MAX_NTP_CACHE_AGE_SEC =
"throttle_max_ntp_cache_age_sec";
+ /**
+ * The maximum size, in bytes, of a download that the download manager will transfer over
+ * a non-wifi connection.
+ * @hide
+ */
+ public static final String DOWNLOAD_MAX_BYTES_OVER_MOBILE =
+ "download_manager_max_bytes_over_mobile";
+
/**
* @hide