summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2012-05-29 15:39:50 -0700
committerGeorge Mount <mount@google.com>2012-05-29 15:39:50 -0700
commit7a2cb35513b1016a5042f0a48d7008455f24a479 (patch)
tree7485f75df72a93a707975439577325273234e135 /core/java
parent82b3b1bce9665a68b32ab0d7393ea63425677f70 (diff)
downloadframeworks_base-7a2cb35513b1016a5042f0a48d7008455f24a479.zip
frameworks_base-7a2cb35513b1016a5042f0a48d7008455f24a479.tar.gz
frameworks_base-7a2cb35513b1016a5042f0a48d7008455f24a479.tar.bz2
Fix monkey NPE in AutoCompletePopup
Bug 6554866 Change-Id: I2942e55d98bc768f5c5c563240c1841c7e869b3c
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/AutoCompletePopup.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/AutoCompletePopup.java b/core/java/android/webkit/AutoCompletePopup.java
index 87e878b..c624ce4 100644
--- 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;