diff options
| author | Guang Zhu <guangzhu@google.com> | 2011-05-04 11:45:11 -0700 |
|---|---|---|
| committer | Guang Zhu <guangzhu@google.com> | 2011-05-04 11:50:05 -0700 |
| commit | 9e78f51d14b9a16d645b754e073f549a5891db26 (patch) | |
| tree | 4222336a96205e8f3ef7faabe42256a250f49aaa /tests | |
| parent | e3cd0a6a60e65103042436ffec68014ec8a2fd5b (diff) | |
| download | android_packages_apps_Gello-9e78f51d14b9a16d645b754e073f549a5891db26.tar.gz android_packages_apps_Gello-9e78f51d14b9a16d645b754e073f549a5891db26.tar.bz2 android_packages_apps_Gello-9e78f51d14b9a16d645b754e073f549a5891db26.zip | |
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 'tests')
| -rw-r--r-- | tests/src/com/android/browser/PopularUrlsTest.java | 1 | ||||
| -rw-r--r-- | tests/src/com/android/browser/TestWebChromeClient.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/src/com/android/browser/PopularUrlsTest.java b/tests/src/com/android/browser/PopularUrlsTest.java index 3e7515f2..a635f0b6 100644 --- a/tests/src/com/android/browser/PopularUrlsTest.java +++ b/tests/src/com/android/browser/PopularUrlsTest.java @@ -77,6 +77,7 @@ public class PopularUrlsTest extends ActivityInstrumentationTestCase2<BrowserAct super.setUp(); Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("about:blank")); + i.putExtra(Controller.NO_CRASH_RECOVERY, true); setActivityIntent(i); mActivity = getActivity(); mController = mActivity.getController(); diff --git a/tests/src/com/android/browser/TestWebChromeClient.java b/tests/src/com/android/browser/TestWebChromeClient.java index 53f8db38..dd84b3a1 100644 --- a/tests/src/com/android/browser/TestWebChromeClient.java +++ b/tests/src/com/android/browser/TestWebChromeClient.java @@ -84,7 +84,9 @@ abstract class TestWebChromeClient extends WebChromeClient { @Override public boolean onCreateWindow(WebView view, boolean dialog, boolean userGesture, Message resultMsg) { - return mWrappedClient.onCreateWindow(view, dialog, userGesture, resultMsg); + // do not open any new pop-ups + resultMsg.sendToTarget(); + return true; } /** {@inheritDoc} */ |