diff options
author | Steve Kondik <shade@chemlab.org> | 2012-03-28 23:08:30 -0700 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2012-03-28 23:08:30 -0700 |
commit | 861e4fa398710cdc9dcfdfde934d8e08bf83f38e (patch) | |
tree | 35cbb86e8258211e903fadc1136549e9984d063e /src/com/android/providers | |
parent | 3aa25385202b61c12512ced16f3724ed064fb974 (diff) | |
parent | 3855dff9082b04a388f6cbf7a78b6b3ea519207f (diff) | |
download | android_packages_providers_DownloadProvider-861e4fa398710cdc9dcfdfde934d8e08bf83f38e.tar.gz android_packages_providers_DownloadProvider-861e4fa398710cdc9dcfdfde934d8e08bf83f38e.tar.bz2 android_packages_providers_DownloadProvider-861e4fa398710cdc9dcfdfde934d8e08bf83f38e.zip |
Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/packages/providers/DownloadProvider into aospics-releaseicscm-9.1.0
Diffstat (limited to 'src/com/android/providers')
-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 76dfff00..1e376e25 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; } } |