summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/BrowserFrame.java
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2011-12-07 18:39:24 -0800
committerSelim Gurun <sgurun@google.com>2011-12-13 10:08:27 -0800
commit38f3610a29c75c3bb16408a911e3365a71b6524c (patch)
tree3758c8c7aef8cc1ce90eb2e03770f5f2ae2ea2cd /core/java/android/webkit/BrowserFrame.java
parent9c8fc9c62015382a9369f983a7ac6c655d9bbaaf (diff)
Move ssl callbacks to webcore thread.
Bug: 4586251 Original CL was for ics-mr1. We decided it should be in master instead. Original CL https://android-git.corp.google.com/g/154083 Current ssl cert logic makes callbacks to webkit from the UI thread. This is not right. Move the callbacks to proper thread. Change-Id: Ie3de7dbaed7780dbb6cf537ca1d29686d867b784
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
-rw-r--r--core/java/android/webkit/BrowserFrame.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java
index c1945599d337..a2ae69b89486 100644
--- a/core/java/android/webkit/BrowserFrame.java
+++ b/core/java/android/webkit/BrowserFrame.java
@@ -1180,11 +1180,19 @@ class BrowserFrame extends Handler {
@Override
public void proceed() {
SslCertLookupTable.getInstance().setIsAllowed(sslError);
- nativeSslCertErrorProceed(handle);
+ post(new Runnable() {
+ public void run() {
+ nativeSslCertErrorProceed(handle);
+ }
+ });
}
@Override
public void cancel() {
- nativeSslCertErrorCancel(handle, certError);
+ post(new Runnable() {
+ public void run() {
+ nativeSslCertErrorCancel(handle, certError);
+ }
+ });
}
};
mCallbackProxy.onReceivedSslError(handler, sslError);