diff options
author | Selim Gurun <sgurun@google.com> | 2012-02-15 19:04:58 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-15 19:04:58 -0800 |
commit | d8d6afdc068e8aa31fddd06f5946311d2b961026 (patch) | |
tree | 7d43a0d1b13be8ddbc87b4d53126cc01581a1b2a /core/java | |
parent | 8963822068a43738dce3a4a799a73ea99487298e (diff) | |
parent | 43e41580e4c700e970cc5e62180a767ab424da6d (diff) | |
download | frameworks_base-d8d6afdc068e8aa31fddd06f5946311d2b961026.zip frameworks_base-d8d6afdc068e8aa31fddd06f5946311d2b961026.tar.gz frameworks_base-d8d6afdc068e8aa31fddd06f5946311d2b961026.tar.bz2 |
Merge "Revert "Act on credential storage updates.""
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/net/http/CertificateChainValidator.java | 16 | ||||
-rw-r--r-- | core/java/android/webkit/WebView.java | 37 | ||||
-rw-r--r-- | core/java/android/webkit/WebViewCore.java | 11 |
3 files changed, 1 insertions, 63 deletions
diff --git a/core/java/android/net/http/CertificateChainValidator.java b/core/java/android/net/http/CertificateChainValidator.java index 06c6c6e..f94d320 100644 --- a/core/java/android/net/http/CertificateChainValidator.java +++ b/core/java/android/net/http/CertificateChainValidator.java @@ -25,17 +25,15 @@ import javax.net.ssl.DefaultHostnameVerifier; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; -import javax.net.ssl.X509TrustManager; import org.apache.harmony.security.provider.cert.X509CertImpl; import org.apache.harmony.xnet.provider.jsse.SSLParametersImpl; -import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl; /** * Class responsible for all server certificate validation functionality * * {@hide} */ -public class CertificateChainValidator { +class CertificateChainValidator { /** * The singleton instance of the certificate chain validator @@ -124,18 +122,6 @@ public class CertificateChainValidator { } /** - * Handles updates to credential storage. - */ - public static void handleTrustStorageUpdate() { - - X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager(); - if( x509TrustManager instanceof TrustManagerImpl ) { - TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager; - trustManager.handleTrustStorageUpdate(); - } - } - - /** * Common code of doHandshakeAndValidateServerCertificates and verifyServerCertificates. * Calls DomainNamevalidator to verify the domain, and TrustManager to verify the certs. * @param chain the cert chain in X509 cert format. diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index e0f4f59..9cd51d0 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -59,7 +59,6 @@ import android.os.Message; import android.os.StrictMode; import android.os.SystemClock; import android.provider.Settings; -import android.security.KeyChain; import android.speech.tts.TextToSpeech; import android.text.Editable; import android.text.InputType; @@ -1304,7 +1303,6 @@ public class WebView extends AbsoluteLayout init(); setupPackageListener(context); setupProxyListener(context); - setupTrustStorageListener(context); updateMultiTouchSupport(context); if (privateBrowsing) { @@ -1314,41 +1312,6 @@ public class WebView extends AbsoluteLayout mAutoFillData = new WebViewCore.AutoFillData(); } - private static class TrustStorageListener extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - if (intent.getAction().equals(KeyChain.ACTION_STORAGE_CHANGED)) { - handleCertTrustChanged(); - } - } - } - private static TrustStorageListener sTrustStorageListener; - - /** - * Handles update to the trust storage. - */ - private static void handleCertTrustChanged() { - // send a message for indicating trust storage change - WebViewCore.sendStaticMessage(EventHub.TRUST_STORAGE_UPDATED, null); - } - - /* - * @param context This method expects this to be a valid context. - */ - private static void setupTrustStorageListener(Context context) { - if (sTrustStorageListener != null ) { - return; - } - IntentFilter filter = new IntentFilter(); - filter.addAction(KeyChain.ACTION_STORAGE_CHANGED); - sTrustStorageListener = new TrustStorageListener(); - Intent current = - context.getApplicationContext().registerReceiver(sTrustStorageListener, filter); - if (current != null) { - handleCertTrustChanged(); - } - } - private static class ProxyReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index b6c5612..14ecfbd 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -26,7 +26,6 @@ import android.graphics.Region; import android.media.MediaFile; import android.net.ProxyProperties; import android.net.Uri; -import android.net.http.CertificateChainValidator; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -776,11 +775,6 @@ public final class WebViewCore { Message m = (Message)msg.obj; m.sendToTarget(); break; - case EventHub.TRUST_STORAGE_UPDATED: - // post a task to network thread for updating trust manager - nativeCertTrustChanged(); - CertificateChainValidator.handleTrustStorageUpdate(); - break; } } }; @@ -1139,9 +1133,6 @@ public final class WebViewCore { static final int SELECT_WORD_AT = 214; static final int SELECT_ALL = 215; - // for updating state on trust storage change - static final int TRUST_STORAGE_UPDATED = 220; - // Private handler for WebCore messages. private Handler mHandler; // Message queue for containing messages before the WebCore thread is @@ -3091,6 +3082,4 @@ public final class WebViewCore { private native void nativeClearTextSelection(int nativeClass); private native void nativeSelectWordAt(int nativeClass, int x, int y); private native void nativeSelectAll(int nativeClass); - - private static native void nativeCertTrustChanged(); } |