diff options
author | Steve Howard <showard@google.com> | 2010-08-03 15:52:36 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-03 15:52:36 -0700 |
commit | fd3cf7d8582054a128fc16b6ee82bcb3de546b02 (patch) | |
tree | 3fedbb8d966ee7fa878ac1cfbcec2e35da4e2c21 /src | |
parent | 40389839299240d63a734a1403529a1ee4a8c091 (diff) | |
parent | 3253c05afccc0cb62c29958d023d863222a5845c (diff) | |
download | android_packages_providers_DownloadProvider-fd3cf7d8582054a128fc16b6ee82bcb3de546b02.tar.gz android_packages_providers_DownloadProvider-fd3cf7d8582054a128fc16b6ee82bcb3de546b02.tar.bz2 android_packages_providers_DownloadProvider-fd3cf7d8582054a128fc16b6ee82bcb3de546b02.zip |
am 3253c05a: am 0d4f9f10: Get wifi limit from secure settings.
Merge commit '3253c05afccc0cb62c29958d023d863222a5845c'
* commit '3253c05afccc0cb62c29958d023d863222a5845c':
Get wifi limit from secure settings.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/downloads/DownloadInfo.java | 2 | ||||
-rw-r--r-- | src/com/android/providers/downloads/RealSystemFacade.java | 11 | ||||
-rw-r--r-- | src/com/android/providers/downloads/SystemFacade.java | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java index ee3ca544..4c08b156 100644 --- a/src/com/android/providers/downloads/DownloadInfo.java +++ b/src/com/android/providers/downloads/DownloadInfo.java @@ -345,7 +345,7 @@ public class DownloadInfo { if (networkType == ConnectivityManager.TYPE_WIFI) { return true; // anything goes over wifi } - Integer maxBytesOverMobile = mSystemFacade.getMaxBytesOverMobile(); + Long maxBytesOverMobile = mSystemFacade.getMaxBytesOverMobile(); if (maxBytesOverMobile == null) { return true; // no limit } diff --git a/src/com/android/providers/downloads/RealSystemFacade.java b/src/com/android/providers/downloads/RealSystemFacade.java index adf0107a..710da10d 100644 --- a/src/com/android/providers/downloads/RealSystemFacade.java +++ b/src/com/android/providers/downloads/RealSystemFacade.java @@ -7,6 +7,8 @@ import android.content.Intent; import android.content.pm.PackageManager.NameNotFoundException; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.provider.Settings; +import android.provider.Settings.SettingNotFoundException; import android.telephony.TelephonyManager; import android.util.Log; @@ -59,8 +61,13 @@ class RealSystemFacade implements SystemFacade { return isRoaming; } - public Integer getMaxBytesOverMobile() { - return null; + public Long getMaxBytesOverMobile() { + try { + return Settings.Secure.getLong(mContext.getContentResolver(), + Settings.Secure.DOWNLOAD_MAX_BYTES_OVER_MOBILE); + } catch (SettingNotFoundException exc) { + return null; + } } @Override diff --git a/src/com/android/providers/downloads/SystemFacade.java b/src/com/android/providers/downloads/SystemFacade.java index 3f8ff264..c1941692 100644 --- a/src/com/android/providers/downloads/SystemFacade.java +++ b/src/com/android/providers/downloads/SystemFacade.java @@ -27,7 +27,7 @@ interface SystemFacade { * @return maximum size, in bytes, of downloads that may go over a mobile connection; or null if * there's no limit */ - public Integer getMaxBytesOverMobile(); + public Long getMaxBytesOverMobile(); /** * Send a broadcast intent. |