summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/BrowserFrame.java
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-10-04 11:22:11 +0100
committerSteve Block <steveblock@google.com>2011-10-05 13:32:32 +0100
commitbf52c0ea10482ad761e4fbc8ce07e9517b8541f6 (patch)
tree381da2270af7402b91478adc06f1920c048fb47b /core/java/android/webkit/BrowserFrame.java
parent270a3c806224403dd48cb7c721693f565d9a0595 (diff)
SSL-related cleanup in BrowserFrame and SslCertLookupTable
- Fix a comment in BrowserFrame.certificate() - Simplify SslCertLookupTable by not storing 'deny' decisions. We only need to store 'allow' decisions, as we don't re-use 'deny' decisions. No change in behaviour. Bug: 5409251 Change-Id: I447cd1966fbb6c2dea8088b2e4c4e2de22405cb9
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
-rw-r--r--core/java/android/webkit/BrowserFrame.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index c107aebe2d1b..8c22da09c15c 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -471,8 +471,6 @@ class BrowserFrame extends Handler {
/**
* We have received an SSL certificate for the main top-level page.
- *
- * !!!Called from the network thread!!!
*/
void certificate(SslCertificate certificate) {
if (mIsMainFrame) {
@@ -1186,12 +1184,11 @@ class BrowserFrame extends Handler {
SslErrorHandler handler = new SslErrorHandler() {
@Override
public void proceed() {
- SslCertLookupTable.getInstance().setIsAllowed(sslError, true);
+ SslCertLookupTable.getInstance().setIsAllowed(sslError);
nativeSslCertErrorProceed(handle);
}
@Override
public void cancel() {
- SslCertLookupTable.getInstance().setIsAllowed(sslError, false);
nativeSslCertErrorCancel(handle, certError);
}
};