summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2011-05-04 11:45:11 -0700
committerGuang Zhu <guangzhu@google.com>2011-05-04 11:50:05 -0700
commit9e78f51d14b9a16d645b754e073f549a5891db26 (patch)
tree4222336a96205e8f3ef7faabe42256a250f49aaa /src/com/android
parente3cd0a6a60e65103042436ffec68014ec8a2fd5b (diff)
downloadpackages_apps_Browser-9e78f51d14b9a16d645b754e073f549a5891db26.zip
packages_apps_Browser-9e78f51d14b9a16d645b754e073f549a5891db26.tar.gz
packages_apps_Browser-9e78f51d14b9a16d645b754e073f549a5891db26.tar.bz2
add an intent parameter to skip crash recovery
This is useful for testing, where crash recovery is handled by the tests and also dialog interaction in undesirabls and also dialog interaction in undesirable. Also included a minor unrelated change to test app to handle/disable pop windows. Change-Id: Iab337b31c803d50b74ba24ca80cc614fa752a846
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/Controller.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 0f33380..5498d6d 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -133,6 +133,9 @@ public class Controller
// "source" parameter for Google search through simplily type
final static String GOOGLE_SEARCH_SOURCE_TYPE = "browser-type";
+ // "no-crash-recovery" parameter in intetnt to suppress crash recovery
+ final static String NO_CRASH_RECOVERY = "no-crash-recovery";
+
private Activity mActivity;
private UI mUi;
private TabControl mTabControl;
@@ -254,7 +257,8 @@ public class Controller
}
void start(final Bundle icicle, final Intent intent) {
- if (icicle != null) {
+ boolean noCrashRecovery = intent.getBooleanExtra(NO_CRASH_RECOVERY, false);
+ if (icicle != null || noCrashRecovery) {
mCrashRecoveryHandler.clearState();
doStart(icicle, intent);
} else {