diff options
| author | Ben Murdoch <benm@google.com> | 2011-07-25 09:34:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-25 09:34:21 -0700 |
| commit | da4533941edc1f4475c49b6f77876ff90aa6a1d4 (patch) | |
| tree | 806fb38dd97f936bb135f4604fa1a67c68cd18eb | |
| parent | 72a3a86efee8a74bfd22c66bae5bfff2e88aa677 (diff) | |
| parent | 50799a99484d50d79edab2ec6d64ad3287ed03f8 (diff) | |
| download | frameworks_base-da4533941edc1f4475c49b6f77876ff90aa6a1d4.zip frameworks_base-da4533941edc1f4475c49b6f77876ff90aa6a1d4.tar.gz frameworks_base-da4533941edc1f4475c49b6f77876ff90aa6a1d4.tar.bz2 | |
Merge "Fix for Autofill calling WebView.getSettings on background thread."
| -rw-r--r-- | core/java/android/webkit/WebView.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 6a3b2ff..e24ab58 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -4701,6 +4701,7 @@ public class WebView extends AbsoluteLayout private Message mUpdateMessage; private boolean mAutoFillable; private boolean mAutoComplete; + private WebSettings mWebSettings; public RequestFormData(String name, String url, Message msg, boolean autoFillable, boolean autoComplete) { @@ -4709,6 +4710,7 @@ public class WebView extends AbsoluteLayout mUpdateMessage = msg; mAutoFillable = autoFillable; mAutoComplete = autoComplete; + mWebSettings = getSettings(); } public void run() { @@ -4718,8 +4720,7 @@ public class WebView extends AbsoluteLayout // Note that code inside the adapter click handler in WebTextView depends // on the AutoFill item being at the top of the drop down list. If you change // the order, make sure to do it there too! - WebSettings settings = getSettings(); - if (settings != null && settings.getAutoFillProfile() != null) { + if (mWebSettings != null && mWebSettings.getAutoFillProfile() != null) { pastEntries.add(getResources().getText( com.android.internal.R.string.autofill_this_form).toString() + " " + |