diff options
author | Vasu Nori <vnori@google.com> | 2011-02-03 18:00:35 -0800 |
---|---|---|
committer | Vasu Nori <vnori@google.com> | 2011-02-03 18:00:35 -0800 |
commit | a29b942fe0f868b9d94299877f39a4ddcc3e85cc (patch) | |
tree | 5fe3b29b023720e9355dfc601ee6afd315a15a52 /src/com/android/providers/downloads/DownloadProvider.java | |
parent | ed4870094f53bcd19c0542400389a1f56636ce5a (diff) | |
parent | 736427485a3e23eebec7fbd69cc5b70f9fe478d6 (diff) | |
download | android_packages_providers_DownloadProvider-a29b942fe0f868b9d94299877f39a4ddcc3e85cc.tar.gz android_packages_providers_DownloadProvider-a29b942fe0f868b9d94299877f39a4ddcc3e85cc.tar.bz2 android_packages_providers_DownloadProvider-a29b942fe0f868b9d94299877f39a4ddcc3e85cc.zip |
resolved conflicts for merge of 73642748 to master
Change-Id: I477599f16db5ea64e4fbc4d2be68dcedf2c80269
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 1b2947f1..9c22596a 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -739,7 +739,7 @@ public final class DownloadProvider extends ContentProvider { values.remove(Downloads.Impl.COLUMN_ALLOW_ROAMING); values.remove(Downloads.Impl.COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI); values.remove(Downloads.Impl.COLUMN_MEDIA_SCANNED); - + values.remove(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS); Iterator<Map.Entry<String, Object>> iterator = values.valueSet().iterator(); while (iterator.hasNext()) { String key = iterator.next().getKey(); |