summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-03-17 16:35:01 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-03-17 16:35:01 -0700
commit977d38d21876fbc39598ff0a966a27db92ee1d59 (patch)
treeadd84188d80cd22ffa3ea87671c6038721790819 /src/com/android
parentf8e520e6b7ba9533117d4805a29fb7321534d6ce (diff)
parentd311b453a4ea32dcc01e766da972c6837b7705ec (diff)
downloadandroid_packages_providers_DownloadProvider-977d38d21876fbc39598ff0a966a27db92ee1d59.tar.gz
android_packages_providers_DownloadProvider-977d38d21876fbc39598ff0a966a27db92ee1d59.tar.bz2
android_packages_providers_DownloadProvider-977d38d21876fbc39598ff0a966a27db92ee1d59.zip
Merge commit 'remotes/korg/cupcake' into merge
Conflicts: docs/index.html src/com/android/providers/downloads/DownloadProvider.java src/com/android/providers/downloads/DownloadService.java
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/providers/downloads/DownloadService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadService.java b/src/com/android/providers/downloads/DownloadService.java
index 4a1d2f8e..07ab9416 100644
--- a/src/com/android/providers/downloads/DownloadService.java
+++ b/src/com/android/providers/downloads/DownloadService.java
@@ -625,11 +625,11 @@ public class DownloadService extends Service {
// nothing
mimetypeIntent.setDataAndType(Uri.fromParts("file", "", null), info.mMimeType);
- List<ResolveInfo> list = getPackageManager().queryIntentActivities(mimetypeIntent,
+ ResolveInfo ri = getPackageManager().resolveActivity(mimetypeIntent,
PackageManager.MATCH_DEFAULT_ONLY);
//Log.i(Constants.TAG, "*** QUERY " + mimetypeIntent + ": " + list);
- if (list.size() == 0) {
+ if (ri == null) {
if (Config.LOGD) {
Log.d(Constants.TAG, "no application to handle MIME type " + info.mMimeType);
}