summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias Falk <mattias.falk@sonyericsson.com>2010-08-23 12:03:57 +0200
committerJohan Redestig <johan.redestig@sonyericsson.com>2010-08-23 12:03:57 +0200
commit552751ea92828f8b78b71533dbba70aa7c316d9d (patch)
treefa0d6180412838dc8e0589a544bf35dd304eeb87 /src
parentd159ec534823b87f9896843e95912b0df8c27e16 (diff)
downloadpackages_apps_browser-552751ea92828f8b78b71533dbba70aa7c316d9d.zip
packages_apps_browser-552751ea92828f8b78b71533dbba70aa7c316d9d.tar.gz
packages_apps_browser-552751ea92828f8b78b71533dbba70aa7c316d9d.tar.bz2
Avoid crash in browser in systems with no search provider
If there's no activity registered for the intent (action) ACTION_WEB_SEARCH the browser will crash if a search query is entered in the browser. The crash is avoided by catching the ActivityNotFoundException. Change-Id: I021d3210654bb3aa08ccdd15abea86ef415282b1
Diffstat (limited to 'src')
-rw-r--r--src/com/android/browser/BrowserActivity.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 5e55789..29e333a 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -629,7 +629,13 @@ public class BrowserActivity extends Activity
intent.putExtra(SearchManager.EXTRA_DATA_KEY, extraData);
}
intent.putExtra(Browser.EXTRA_APPLICATION_ID, getPackageName());
- startActivity(intent);
+
+ // can't be sure there is an activity for the Intent
+ try {
+ startActivity(intent);
+ } catch (ActivityNotFoundException ex) {
+ return false;
+ }
return true;
}