From bf3e69efacadd9186604a53fee0e6734b1723bcd Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Mon, 3 Aug 2009 12:13:15 -0700 Subject: [PATCH] DO NOT MERGE Fix the build, which has been also fixed separately in the master --- tests/CoreTests/android/core/TestEventHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/CoreTests/android/core/TestEventHandler.java b/tests/CoreTests/android/core/TestEventHandler.java index 4cfcadeaca997..45f2f69c6006d 100644 --- a/tests/CoreTests/android/core/TestEventHandler.java +++ b/tests/CoreTests/android/core/TestEventHandler.java @@ -497,7 +497,7 @@ public class TestEventHandler implements EventHandler { * SSL certificate error callback. Handles SSL error(s) on the way * up to the user. */ - public void handleSslErrorRequest(SslError error) { + public boolean handleSslErrorRequest(SslError error) { int primaryError = error.getPrimaryError(); if (Config.LOGV) { @@ -527,6 +527,9 @@ public class TestEventHandler implements EventHandler { if (expectSslErrors == -1) // && expectSslCertificate == certificate? expects[TEST_SSL_CERTIFICATE_ERROR] = false; + + // return false so that we won't block the thread + return false; } /**