am 20c15a42: Merge "Fix monkey NPE in AutoCompletePopup" into jb-dev

* commit '20c15a4271ea3a7fb2210430bfc53f611603cf76':
  Fix monkey NPE in AutoCompletePopup

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;