commit 3855dff9082b04a388f6cbf7a78b6b3ea519207f
author The Android Automerger <android-build@android.com> Fri Jan 06 16:32:55 2012 -0800
committer The Android Automerger <android-build@android.com> Fri Jan 06 16:32:55 2012 -0800
tree d0806fb582fca54e82542697b0165dd6617f6ab9
parent f720bc684b1a8332eb4d5f8d25c5feaf7eb54433
parent d8c13d669e2e80d2a52d7ae2567006afc7a765fd

merge in ics-mr1-release history after reset to ics-mr1

src/com/android/providers/downloads/DownloadInfo.java

diff --git a/src/com/android/providers/downloads/DownloadInfo.java b/src/com/android/providers/downloads/DownloadInfo.java
index 00b1045..304d70f 100644
--- a/src/com/android/providers/downloads/DownloadInfo.java
+++ b/src/com/android/providers/downloads/DownloadInfo.java
@@ -397,8 +397,9 @@
      */
     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;
             }
         }