summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Grace Kloba <klobag@google.com> 2009-08-03 12:13:15 -0700
committer Grace Kloba <klobag@google.com> 2009-08-03 12:13:15 -0700
commitbf3e69efacadd9186604a53fee0e6734b1723bcd (patch)
tree0ef4fc13f8ca297161c8ae8fcd6d7f78148ee4e7
parent7a3e39cac812b6ec63fade9613bb0c1f04156fa0 (diff)
DO NOT MERGE
Fix the build, which has been also fixed separately in the master
-rw-r--r--tests/CoreTests/android/core/TestEventHandler.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/CoreTests/android/core/TestEventHandler.java b/tests/CoreTests/android/core/TestEventHandler.java
index 4cfcadeaca99..45f2f69c6006 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;
}
/**