diff options
author | Vasu Nori <vnori@google.com> | 2010-11-09 12:30:19 -0800 |
---|---|---|
committer | Vasu Nori <vnori@google.com> | 2010-11-12 15:41:13 -0800 |
commit | 01d0182d86db003b2da5b831cb26820093888d9a (patch) | |
tree | f2573bb9cb686dedae3f88659b21d28ee4359dc8 /src/com/android/providers/downloads/DownloadProvider.java | |
parent | aad00f949ff6f941a251c8ad9bfa341dce412c58 (diff) | |
download | android_packages_providers_DownloadProvider-01d0182d86db003b2da5b831cb26820093888d9a.tar.gz android_packages_providers_DownloadProvider-01d0182d86db003b2da5b831cb26820093888d9a.tar.bz2 android_packages_providers_DownloadProvider-01d0182d86db003b2da5b831cb26820093888d9a.zip |
provider changes due to CL: Ief1693785f0484c1b434fb41a68693f9aff96492
Change-Id: I8940778292d0a9166cfcfb92d37ea568b8f6ceef
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 79544675..9604c855 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -37,7 +37,6 @@ import android.os.Environment; import android.os.ParcelFileDescriptor; import android.os.Process; import android.provider.Downloads; -import android.text.TextUtils; import android.util.Log; import com.google.common.annotations.VisibleForTesting; @@ -45,6 +44,7 @@ import com.google.common.annotations.VisibleForTesting; import java.io.File; import java.io.FileNotFoundException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -142,6 +142,8 @@ public final class DownloadProvider extends ContentProvider { sAppReadableColumnsSet.add(sAppReadableColumnsArray[i]); } } + private static final List<String> downloadManagerColumnsList = + Arrays.asList(DownloadManager.UNDERLYING_COLUMNS); /** The database that lies underneath this content provider */ private SQLiteOpenHelper mOpenHelper = null; @@ -741,8 +743,10 @@ public final class DownloadProvider extends ContentProvider { if (projection == null) { projection = sAppReadableColumnsArray; } else { + // check the validity of the columns in projection for (int i = 0; i < projection.length; ++i) { - if (!sAppReadableColumnsSet.contains(projection[i])) { + if (!sAppReadableColumnsSet.contains(projection[i]) && + !downloadManagerColumnsList.contains(projection[i])) { throw new IllegalArgumentException( "column " + projection[i] + " is not allowed in queries"); } |