summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-11-16 07:54:04 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-16 07:54:04 -0800
commit4cb5cbcd52602377881045e55ca24b63b4756aa7 (patch)
tree116ab7a2c93c27c897062ce303a99dcfcb7905da
parentd7973056703d47fe37b0ee57c36350834aeda827 (diff)
parent7c08a2b624566e731b4f23235d05de6eb2859235 (diff)
downloadpackages_apps_browser-4cb5cbcd52602377881045e55ca24b63b4756aa7.zip
packages_apps_browser-4cb5cbcd52602377881045e55ca24b63b4756aa7.tar.gz
packages_apps_browser-4cb5cbcd52602377881045e55ca24b63b4756aa7.tar.bz2
Merge "Go to downloads page if you cannot open the download."
-rw-r--r--src/com/android/browser/OpenDownloadReceiver.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/browser/OpenDownloadReceiver.java b/src/com/android/browser/OpenDownloadReceiver.java
index 02dba51..3970a5f 100644
--- a/src/com/android/browser/OpenDownloadReceiver.java
+++ b/src/com/android/browser/OpenDownloadReceiver.java
@@ -17,6 +17,7 @@
package com.android.browser;
import android.app.DownloadManager;
+import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -53,7 +54,11 @@ public class OpenDownloadReceiver extends BroadcastReceiver {
Intent launchIntent = new Intent(Intent.ACTION_VIEW);
launchIntent.setDataAndType(uri, context.getContentResolver().getType(uri));
launchIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- context.startActivity(launchIntent);
+ try {
+ context.startActivity(launchIntent);
+ } catch (ActivityNotFoundException e) {
+ openDownloadsPage(context);
+ }
}
}