diff options
3 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 6de6995eb9c9..fabda086caea 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -1237,6 +1237,7 @@ public class WebSettings { /** * Sets whether XSS Auditor is enabled. * @param flag Whether XSS Auditor should be enabled. + * @hide Only used by LayoutTestController. */ public synchronized void setXSSAuditorEnabled(boolean flag) { if (mXSSAuditorEnabled != flag) { diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java index 742b1a013fe3..a5870f8dfae5 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/CallbackProxy.java @@ -281,8 +281,7 @@ public class CallbackProxy extends Handler implements EventSender, LayoutTestCon break; case SET_XSS_AUDITOR_ENABLED: - mLayoutTestController.setXSSAuditorEnabled( - msg.arg1 == 1 ? true : false); + mLayoutTestController.setXSSAuditorEnabled(msg.arg1 == 1); break; } } diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java index 44f86407ec40..0a04712d2368 100644 --- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java +++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java @@ -838,6 +838,7 @@ public class TestShellActivity extends Activity implements LayoutTestController settings.setDatabasePath(getDir("databases",0).getAbsolutePath()); settings.setDomStorageEnabled(true); settings.setWorkersEnabled(false); + settings.setXSSAuditorEnabled(false); } private WebView mWebView; |