am e80c3555: am e61798da: Extend PublicApiAccessTest to exercise DownloadManager.

Merge commit 'e80c35557bd72489323303af9d93c2c33c88cce9'

* commit 'e80c35557bd72489323303af9d93c2c33c88cce9':
  Extend PublicApiAccessTest to exercise DownloadManager.

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) {