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

Merge "Fix SslError.getPrimaryError() to return -1 if the set of errors is empty"

Browse Source
This commit is contained in:
Steve Block
2011-10-06 08:48:52 -07:00
committed by Android (Google) Code Review
parent 11a670531f 518f72ca38
commit 3475ebfab2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/http/SslError.java
View File

@@ -198,7 +198,8 @@ public class SslError {
/** /**
* Gets the most severe SSL error in this object's set of errors. * Gets the most severe SSL error in this object's set of errors.
* @return The most severe SSL error. * Returns -1 if the set is empty.
* @return The most severe SSL error, or -1 if the set is empty.
*/ */
public int getPrimaryError() { public int getPrimaryError() {
if (mErrors != 0) { if (mErrors != 0) {
@@ -208,9 +209,11 @@ public class SslError {
return error; return error;
} }
} }
// mErrors should never be set to an invalid value.
assert false;
} }
return 0; return -1;
} }
/** /**

4
core/java/android/webkit/SslErrorHandlerImpl.java
View File

@@ -159,7 +159,7 @@ class SslErrorHandlerImpl extends SslErrorHandler {
if (DebugFlags.SSL_ERROR_HANDLER) { if (DebugFlags.SSL_ERROR_HANDLER) {
assert host != null; assert host != null;
assert primary != 0; assert primary != -1;
} }
if (mSslPrefTable.containsKey(host) && primary <= mSslPrefTable.getInt(host)) { if (mSslPrefTable.containsKey(host) && primary <= mSslPrefTable.getInt(host)) {
@@ -260,7 +260,7 @@ class SslErrorHandlerImpl extends SslErrorHandler {
if (DebugFlags.SSL_ERROR_HANDLER) { if (DebugFlags.SSL_ERROR_HANDLER) {
assert host != null; assert host != null;
assert primary != 0; assert primary != -1;
} }
boolean hasKey = mSslPrefTable.containsKey(host); boolean hasKey = mSslPrefTable.containsKey(host);
if (!hasKey || primary > mSslPrefTable.getInt(host)) { if (!hasKey || primary > mSslPrefTable.getInt(host)) {