diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-15 02:33:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-15 02:33:50 -0800 |
| commit | 2f3496b424583204df93511e6ca9795d38637c5d (patch) | |
| tree | bf7f6f001bc929a5dd2e4f73db750b43a0833680 /core | |
| parent | 7eec10e6c99c30d5ee061fec08ac89ad4254ac32 (diff) | |
| parent | 685c05eb548155c236cd3308e6c60e32c2f3718d (diff) | |
| download | frameworks_base-2f3496b424583204df93511e6ca9795d38637c5d.zip frameworks_base-2f3496b424583204df93511e6ca9795d38637c5d.tar.gz frameworks_base-2f3496b424583204df93511e6ca9795d38637c5d.tar.bz2 | |
Merge "Stop loading if the user cancels the SSL certificate warning dialog"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/LoadListener.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/webkit/LoadListener.java b/core/java/android/webkit/LoadListener.java index 33f5655..a29299d 100644 --- a/core/java/android/webkit/LoadListener.java +++ b/core/java/android/webkit/LoadListener.java @@ -836,8 +836,7 @@ class LoadListener extends Handler implements EventHandler { mRequestHandle.handleSslErrorResponse(proceed); } if (!proceed) { - // Commit whatever data we have and tear down the loader. - commitLoad(); + mBrowserFrame.stopLoading(); tearDown(); } } |