Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE

Browse Source 
Fix the build, which has been also fixed separately in the master
This commit is contained in:
Grace Kloba
2009-08-03 12:13:15 -07:00
parent 7a3e39cac8
commit bf3e69efac
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/CoreTests/android/core/TestEventHandler.java
View File

@@ -497,7 +497,7 @@ public class TestEventHandler implements EventHandler {
* SSL certificate error callback. Handles SSL error(s) on the way * SSL certificate error callback. Handles SSL error(s) on the way
* up to the user. * up to the user.
*/ */
public void handleSslErrorRequest(SslError error) { public boolean handleSslErrorRequest(SslError error) {
int primaryError = error.getPrimaryError(); int primaryError = error.getPrimaryError();
if (Config.LOGV) { if (Config.LOGV) {
@@ -527,6 +527,9 @@ public class TestEventHandler implements EventHandler {
if (expectSslErrors == -1) // && expectSslCertificate == certificate? if (expectSslErrors == -1) // && expectSslCertificate == certificate?
expects[TEST_SSL_CERTIFICATE_ERROR] = false; expects[TEST_SSL_CERTIFICATE_ERROR] = false;
// return false so that we won't block the thread
return false;
} }
/** /**