summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-01-05 14:37:51 -0800
committerJeff Sharkey <jsharkey@android.com>2012-01-05 14:41:35 -0800
commitf720bc684b1a8332eb4d5f8d25c5feaf7eb54433 (patch)
treed0806fb582fca54e82542697b0165dd6617f6ab9
parenta318a7fc77521dae0ea4afdc087dd30973e89f50 (diff)
downloadandroid_packages_providers_DownloadProvider-f720bc684b1a8332eb4d5f8d25c5feaf7eb54433.tar.gz
android_packages_providers_DownloadProvider-f720bc684b1a8332eb4d5f8d25c5feaf7eb54433.tar.bz2
android_packages_providers_DownloadProvider-f720bc684b1a8332eb4d5f8d25c5feaf7eb54433.zip
Allow downloads when no network restriction set.
Fixes bug where DownloadManager would block downloads on WiMAX, bluetooth, and ethernet networks, even when no network restrictions had been set. Bug: 5689335 Change-Id: I6d1bb78cbccb3c5eb1fce40a13b0689be0c3fa13
-rw-r--r--src/com/android/providers/downloads/DownloadInfo.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java
index 00b10452..304d70fd 100644
--- a/src/com/android/providers/downloads/DownloadInfo.java
+++ b/src/com/android/providers/downloads/DownloadInfo.java
@@ -397,8 +397,9 @@ public class DownloadInfo {
*/
private int checkIsNetworkTypeAllowed(int networkType) {
if (mIsPublicApi) {
- int flag = translateNetworkTypeToApiFlag(networkType);
- if ((flag & mAllowedNetworkTypes) == 0) {
+ final int flag = translateNetworkTypeToApiFlag(networkType);
+ final boolean allowAllNetworkTypes = mAllowedNetworkTypes == ~0;
+ if (!allowAllNetworkTypes && (flag & mAllowedNetworkTypes) == 0) {
return NETWORK_TYPE_DISALLOWED_BY_REQUESTOR;
}
}