From d99d0dc43a3c26c77dd22e405efbdf0753d8309e Mon Sep 17 00:00:00 2001 From: Paul Westbrook Date: Tue, 1 Feb 2011 14:26:16 -0800 Subject: [PATCH] Enable retrieving default download manager settings Enable retrieving the default download manager settings from a resource, when the SettingsProvider database is created The default setting for these values is -1, which will cause DownloadManger to not enforce a limit. Bug: 3341145 Change-Id: I25294d0f75fb0bdf20d4bef54457056c25c31add --- packages/SettingsProvider/res/values/defaults.xml | 5 +++++ .../android/providers/settings/DatabaseHelper.java | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 27c8aeaaf352e..2df6d68581894 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -116,4 +116,9 @@ 0 + + + -1 + + -1 diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 580113cf9d429..49b71e2e17039 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1295,6 +1295,20 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadStringSetting(stmt, Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS, R.string.def_accessibility_web_content_key_bindings); + + final int maxBytes = mContext.getResources().getInteger( + R.integer.def_download_manager_max_bytes_over_mobile); + if (maxBytes > 0) { + loadSetting(stmt, Settings.Secure.DOWNLOAD_MAX_BYTES_OVER_MOBILE, + Integer.toString(maxBytes)); + } + + final int recommendedMaxBytes = mContext.getResources().getInteger( + R.integer.def_download_manager_recommended_max_bytes_over_mobile); + if (recommendedMaxBytes > 0) { + loadSetting(stmt, Settings.Secure.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE, + Integer.toString(recommendedMaxBytes)); + } } finally { if (stmt != null) stmt.close(); }