diff options
| author | Selim Gurun <sgurun@google.com> | 2013-04-04 16:20:29 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2013-04-04 16:31:01 -0700 |
| commit | 93c39d5d4fe8a31da35f8d1d522acb7b676946af (patch) | |
| tree | 81f614f520aa3dafa27ce3d3debaf9e00eb33c21 /core/java/android | |
| parent | 7918cf4e6b18ab1aa4dce1cb791bb88ec1f383d6 (diff) | |
DO NOT MERGE Fix issues during backport
Fix issues related to I219accd5db0c8a0e64b8aab3b049a8cee7dc168f.
Change-Id: Iacf72a9c618d59601c373de948a3f7cbfcbd7038
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 66c2727a03eb..994f0c165f32 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -75,6 +75,7 @@ class BrowserFrame extends Handler { private final CallbackProxy mCallbackProxy; private final WebSettingsClassic mSettings; private final Context mContext; + private final WebViewDatabaseClassic mDatabase; private final WebViewCore mWebViewCore; /* package */ boolean mLoadInitFromJava; private int mLoadType; @@ -252,6 +253,7 @@ class BrowserFrame extends Handler { mSettings = settings; mContext = context; mCallbackProxy = proxy; + mDatabase = WebViewDatabaseClassic.getInstance(appContext); mWebViewCore = w; mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy); @@ -830,10 +832,9 @@ class BrowserFrame extends Handler { // the post data (there could be another form on the // page and that was posted instead. String postString = new String(postData); - WebViewDatabaseClassic db = WebViewDatabaseClassic.getInstance(mContext); if (postString.contains(URLEncoder.encode(username)) && postString.contains(URLEncoder.encode(password))) { - String[] saved = db.getUsernamePassword(schemePlusHost); + String[] saved = mDatabase.getUsernamePassword(schemePlusHost); if (saved != null) { // null username implies that user has chosen not to // save password @@ -841,7 +842,7 @@ class BrowserFrame extends Handler { // non-null username implies that user has // chosen to save password, so update the // recorded password - db.setUsernamePassword(schemePlusHost, username, + mDatabase.setUsernamePassword(schemePlusHost, username, password); } } else { |