Merge change 9514 (7865fe38) · Commits · e / os / android_frameworks_base

tests/CoreTests/android/core/TestEventHandler.java

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}

	/**		/**