Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev

2012-05-30 07:36:11 -07:00
parent 17150cf91b 7a2cb35513
commit 20c15a4271
1 changed files with 4 additions and 1 deletions
--- a/core/java/android/webkit/AutoCompletePopup.java
+++ b/core/java/android/webkit/AutoCompletePopup.java
@@ -181,8 +181,11 @@ class AutoCompletePopup implements OnItemClickListener, Filter.FilterListener,
                // There is no autofill profile setup yet and the user has
                // elected to try and set one up. Call through to the
                // embedder to action that.
-                mWebView.getWebChromeClient().setupAutoFill(
+                WebChromeClient webChromeClient = mWebView.getWebChromeClient();
+                if (webChromeClient != null) {
+                    webChromeClient.setupAutoFill(
                        mHandler.obtainMessage(AUTOFILL_FORM));
+                }
            }
        } else {
            Object selectedItem;