diff --git a/core/java/android/webkit/AccessibilityInjector.java b/core/java/android/webkit/AccessibilityInjector.java index fd73fdaa03e2d..7dfb5bb102e2a 100644 --- a/core/java/android/webkit/AccessibilityInjector.java +++ b/core/java/android/webkit/AccessibilityInjector.java @@ -279,7 +279,6 @@ class AccessibilityInjector { } if (!shouldInjectJavaScript(url)) { - mAccessibilityScriptInjected = false; toggleFallbackAccessibilityInjector(true); return; } @@ -292,23 +291,6 @@ class AccessibilityInjector { mAccessibilityScriptInjected = true; } - /** - * Adjusts the accessibility injection state to reflect changes in the - * JavaScript enabled state. - * - * @param enabled Whether JavaScript is enabled. - */ - public void updateJavaScriptEnabled(boolean enabled) { - if (enabled) { - addAccessibilityApisIfNecessary(); - } else { - removeAccessibilityApisIfNecessary(); - } - - // We have to reload the page after adding or removing APIs. - mWebView.reload(); - } - /** * Toggles the non-JavaScript method for handling accessibility. * diff --git a/core/java/android/webkit/WebSettingsClassic.java b/core/java/android/webkit/WebSettingsClassic.java index 1be917e4ef9cb..66651f7be2a36 100644 --- a/core/java/android/webkit/WebSettingsClassic.java +++ b/core/java/android/webkit/WebSettingsClassic.java @@ -1135,7 +1135,6 @@ public class WebSettingsClassic extends WebSettings { if (mJavaScriptEnabled != flag) { mJavaScriptEnabled = flag; postSync(); - mWebView.updateJavaScriptEnabled(flag); } } diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index a9efd7bbdd0ed..8d794923ead19 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -1626,12 +1626,6 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc mZoomManager.updateMultiTouchSupport(context); } - void updateJavaScriptEnabled(boolean enabled) { - if (isAccessibilityEnabled()) { - getAccessibilityInjector().updateJavaScriptEnabled(enabled); - } - } - private void init() { OnTrimMemoryListener.init(mContext); mWebView.setWillNotDraw(false);