diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-01-06 14:28:47 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-06 14:28:47 -0800 |
commit | 94cb75dab204b67fd38502120d67c008ce554626 (patch) | |
tree | 5ab9f76569061a0705159ae306719f1b647734f2 | |
parent | 8a718ea934c7545af0dafd6bd3fe3c1846a1a199 (diff) | |
parent | 23bb4b4fb4076d09959b35f3e1247941ef7066c2 (diff) | |
download | android_packages_providers_DownloadProvider-94cb75dab204b67fd38502120d67c008ce554626.tar.gz android_packages_providers_DownloadProvider-94cb75dab204b67fd38502120d67c008ce554626.tar.bz2 android_packages_providers_DownloadProvider-94cb75dab204b67fd38502120d67c008ce554626.zip |
am 23bb4b4f: am 380044a2: am f720bc68: Allow downloads when no network restriction set.
* commit '23bb4b4fb4076d09959b35f3e1247941ef7066c2':
Allow downloads when no network restriction set.
-rw-r--r-- | src/com/android/providers/downloads/DownloadInfo.java | 5 |
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; } } |