Merge korg/donut into korg/master

[android-x86/packages-providers-DownloadProvider.git] / src / com / android / providers / downloads / Helpers.java

diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index 0226eba..d8f262c 100644 (file)
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -38,7 +38,6 @@ import android.webkit.MimeTypeMap;
 import java.io.File; 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.util.List;
 import java.util.Random;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -115,11 +114,10 @@ public class Helpers {
 
                 PackageManager pm = context.getPackageManager();
                 intent.setDataAndType(Uri.fromParts("file", "", null), mimeType);
-                List<ResolveInfo> list = pm.queryIntentActivities(intent,
-                        PackageManager.MATCH_DEFAULT_ONLY);
+                ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
                 //Log.i(Constants.TAG, "*** FILENAME QUERY " + intent + ": " + list);
 
-                if (list.size() == 0) {
+                if (ri == null) {
                     if (Config.LOGD) {
                         Log.d(Constants.TAG, "no handler found for type " + mimeType);
                     }
@@ -428,9 +426,9 @@ public class Helpers {
                 Downloads.CONTENT_URI,
                 null,
                 "( " +
-                Downloads.COLUMN_STATUS + " = " + Downloads.STATUS_SUCCESS + " AND " +
+                Downloads.COLUMN_STATUS + " = '" + Downloads.STATUS_SUCCESS + "' AND " +
                 Downloads.COLUMN_DESTINATION +
-                        " = " + Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE + " )",
+                        " = '" + Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE + "' )",
                 null,
                 Downloads.COLUMN_LAST_MODIFICATION);
         if (cursor == null) {