Skip to content

Commit a0d767c

Browse files
author
Steve Block
committed
Always call WebView.onPageStarted(), regardless of whether a WebViewClient has been set
This makes sure that the page's SSL certificate is cleared when the page load starts. Follows on from https://android-git.corp.google.com/g/#/c/138147. Bug: 5287216 Change-Id: I40f74a72dc495c48d7167b7b70a845a8481feb85
1 parent d9151bf commit a0d767c

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

core/java/android/webkit/CallbackProxy.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -905,11 +905,9 @@ public void startWait() {
905905
*/
906906

907907
public void onPageStarted(String url, Bitmap favicon) {
908-
// Do an unsynchronized quick check to avoid posting if no callback has
909-
// been set.
910-
if (mWebViewClient == null) {
911-
return;
912-
}
908+
// We need to send the message even if no WebViewClient is set, because we need to call
909+
// WebView.onPageStarted().
910+
913911
// Performance probe
914912
if (PERF_PROBE) {
915913
mWebCoreThreadTime = SystemClock.currentThreadTimeMillis();

0 commit comments

Comments
 (0)