Merge "Fix Google app crash"

2015-04-08 01:54:42 +00:00
parent 50d126bc24 7e01c4ceb6
commit 6dc7ca3040
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -2427,7 +2427,9 @@ public class WebView extends AbsoluteLayout

    @Override
    public void onProvideVirtualAssistStructure(ViewAssistStructure structure) {
-        mProvider.getViewDelegate().onProvideVirtualAssistStructure(structure);
+        super.onProvideVirtualAssistStructure(structure);
+        // TODO: enable when chromium backend lands.
+        // mProvider.getViewDelegate().onProvideVirtualAssistStructure(structure);
    }

    /** @hide */