Fix accessibility delegation

Ensures that delegate code is run last. Previously, calling the super
method from an accessibility delegate set on a widget would only run
code in the widget's parent. Next, the delegate code would run. Finally,
the widget's code would run. As a result, the widget code would override
any data supplied by the delegate.

By moving all overridden code to internal methods, we ensure that the
call chain for super includes the widget's parent code followed by the
widget's code. The delegate code will always run last.

BUG: 17641433
Change-Id: Ib9d403156c1fc4fb04f65f3c126d1277a44b3740

1 files changed, 3 insertions, 3 deletions

diff --git a/core/java/android/webkit/WebViewProvider.java b/core/java/android/webkit/WebViewProvider.java
index 2aee57b4a63a..e8be4a6fdc60 100644
--- a/core/java/android/webkit/WebViewProvider.java
+++ b/core/java/android/webkit/WebViewProvider.java
@@ -292,11 +292,11 @@ public interface WebViewProvider {
 
         public AccessibilityNodeProvider getAccessibilityNodeProvider();
 
-        public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info);
+        public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info);
 
-        public void onInitializeAccessibilityEvent(AccessibilityEvent event);
+        public void onInitializeAccessibilityEventInternal(AccessibilityEvent event);
 
-        public boolean performAccessibilityAction(int action, Bundle arguments);
+        public boolean performAccessibilityActionInternal(int action, Bundle arguments);
 
         public void setOverScrollMode(int mode);