summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-08-02 16:51:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-02 16:51:52 -0700
commit80782220708fdc8575502ac68c884ddab5c78ac2 (patch)
tree49bb7550e0d2e3208f53a6fc0f3480e4623ff891
parente0b35c6d44ea548b52a4e536b2dbd03c94b0afd3 (diff)
parent14805b6c1ff0fe5324d05ba1dd5053cdf61459b7 (diff)
downloadframeworks_base-80782220708fdc8575502ac68c884ddab5c78ac2.zip
frameworks_base-80782220708fdc8575502ac68c884ddab5c78ac2.tar.gz
frameworks_base-80782220708fdc8575502ac68c884ddab5c78ac2.tar.bz2
am 14805b6c: Merge "New secure setting for mobile download size limit." into gingerbread
Merge commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7' into gingerbread-plus-aosp * commit '14805b6c1ff0fe5324d05ba1dd5053cdf61459b7': New secure setting for mobile download size limit.
-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 ea4738f..ebc85d3 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3373,6 +3373,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