From 992ceefbcfa3e93bfa735a5c2b75166122b059d8 Mon Sep 17 00:00:00 2001
From: alanv <alanv@google.com>
Date: Thu, 1 Nov 2012 14:25:01 -0700
Subject: 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
---
 core/java/android/webkit/WebViewClassic.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/java/android/webkit/WebViewClassic.java')

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);
         }
-- 
cgit v1.2.3