Commit 53baf074 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am c961c78c: am f17361e7: Remove unnecessary comments in SSLParametersImpl.

* commit 'c961c78c':
  Remove unnecessary comments in SSLParametersImpl.
parents cac0e43c c961c78c
......@@ -136,24 +136,13 @@ public class SSLParametersImpl implements Cloneable {
} else {
x509TrustManager = findFirstX509TrustManager(tms);
}
// initialize secure random
// BEGIN android-removed
// if (sr == null) {
// if (defaultSecureRandom == null) {
// defaultSecureRandom = new SecureRandom();
// }
// secureRandom = defaultSecureRandom;
// } else {
// secureRandom = sr;
// }
// END android-removed
// BEGIN android-added
// We simply use the SecureRandom passed in by the caller. If it's
// null, we don't replace it by a new instance. The native code below
// then directly accesses /dev/urandom. Not the most elegant solution,
// but faster than going through the SecureRandom object.
secureRandom = sr;
// END android-added
enabledProtocols = NativeCrypto.getDefaultProtocols();
enabledCipherSuites = NativeCrypto.getDefaultCipherSuites();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment