Fix accessibility API injection.

Also adds a heartbeat check so that if something does go wrong while adding
the JavaScript APIs, we don't attempt to use the JavaScript-based screen
reader.

Bug: 7450237
Change-Id: Ifbce77cf93115f658386c520b8226941607b2afe

1 files changed, 3 insertions, 0 deletions

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 0f8966e2854b..ae56e6bfde0e 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -2500,6 +2500,9 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
             // Remove all pending messages because we are restoring previous
             // state.
             mWebViewCore.removeMessages();
+            if (isAccessibilityInjectionEnabled()) {
+                getAccessibilityInjector().addAccessibilityApisIfNecessary();
+            }
             // Send a restore state message.
             mWebViewCore.sendMessage(EventHub.RESTORE_STATE, index);
         }