diff options
| author | Steve Howard <showard@google.com> | 2010-08-16 13:20:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-16 13:20:22 -0700 |
| commit | e80c35557bd72489323303af9d93c2c33c88cce9 (patch) | |
| tree | 0f3032b88862a11685f95a84d6d27464ac9958ad /src/com | |
| parent | b986eca2ca6764f1f3ed60ebfb82a8d8306acbac (diff) | |
| parent | e61798da80558450f580ed948d0d469bd6423d8e (diff) | |
| download | android_packages_providers_DownloadProvider-e80c35557bd72489323303af9d93c2c33c88cce9.tar.gz android_packages_providers_DownloadProvider-e80c35557bd72489323303af9d93c2c33c88cce9.tar.bz2 android_packages_providers_DownloadProvider-e80c35557bd72489323303af9d93c2c33c88cce9.zip | |
am e61798da: Extend PublicApiAccessTest to exercise DownloadManager.
Merge commit 'e61798da80558450f580ed948d0d469bd6423d8e' into gingerbread-plus-aosp
* commit 'e61798da80558450f580ed948d0d469bd6423d8e':
Extend PublicApiAccessTest to exercise DownloadManager.
Diffstat (limited to 'src/com')
| -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 41b732f1..4fcae227 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) { |