diff options
author | Steve Howard <showard@google.com> | 2010-08-16 15:19:36 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-16 15:19:36 -0700 |
commit | a69384858be6b58739b4ce759ec8db3883283d3e (patch) | |
tree | 6640173e649ce359969fc64e209b8262f2b09494 /src | |
parent | bf0098cc34004c49aa78713035910faa70983c26 (diff) | |
parent | e80c35557bd72489323303af9d93c2c33c88cce9 (diff) | |
download | android_packages_providers_DownloadProvider-a69384858be6b58739b4ce759ec8db3883283d3e.tar.gz android_packages_providers_DownloadProvider-a69384858be6b58739b4ce759ec8db3883283d3e.tar.bz2 android_packages_providers_DownloadProvider-a69384858be6b58739b4ce759ec8db3883283d3e.zip |
am e80c3555: am e61798da: Extend PublicApiAccessTest to exercise DownloadManager.
Merge commit 'e80c35557bd72489323303af9d93c2c33c88cce9'
* commit 'e80c35557bd72489323303af9d93c2c33c88cce9':
Extend PublicApiAccessTest to exercise DownloadManager.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 4667b41c..f6b65c3c 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -46,6 +46,7 @@ import com.google.common.annotations.VisibleForTesting; import java.io.File; import java.io.FileNotFoundException; import java.util.HashSet; +import java.util.Iterator; import java.util.Map; @@ -518,6 +519,13 @@ public final class DownloadProvider extends ContentProvider { values.remove(Downloads.Impl.COLUMN_NOTIFICATION_PACKAGE); // checked later in insert() values.remove(Downloads.Impl.COLUMN_ALLOWED_NETWORK_TYPES); values.remove(Downloads.Impl.COLUMN_ALLOW_ROAMING); + Iterator<Map.Entry<String, Object>> iterator = values.valueSet().iterator(); + while (iterator.hasNext()) { + String key = iterator.next().getKey(); + if (key.startsWith(Downloads.Impl.RequestHeaders.INSERT_KEY_PREFIX)) { + iterator.remove(); + } + } // any extra columns are extraneous and disallowed if (values.size() > 0) { |