summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-01-06 14:22:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-06 14:22:58 -0800
commit380044a236ffba16a800cb683fa648860dcfd573 (patch)
treed0806fb582fca54e82542697b0165dd6617f6ab9 /src
parent13a089576461d61a49e6770c41faa9afcdcc8816 (diff)
parentf720bc684b1a8332eb4d5f8d25c5feaf7eb54433 (diff)
downloadandroid_packages_providers_DownloadProvider-380044a236ffba16a800cb683fa648860dcfd573.tar.gz
android_packages_providers_DownloadProvider-380044a236ffba16a800cb683fa648860dcfd573.tar.bz2
android_packages_providers_DownloadProvider-380044a236ffba16a800cb683fa648860dcfd573.zip
am f720bc68: Allow downloads when no network restriction set.
* commit 'f720bc684b1a8332eb4d5f8d25c5feaf7eb54433': Allow downloads when no network restriction set.
Diffstat (limited to 'src')
-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;
}
}