Update client connection manager w/ bdc fix in AOSP branch
Bug: 6838215 Change-Id: I39a2ea0b54aca34062e1a2ccc472e701c3ef2f79
This commit is contained in:
parent
cf3b3ae987
commit
0e969171bb
@ -102,11 +102,10 @@ public class EmailClientConnectionManager extends ThreadSafeClientConnManager {
|
|||||||
}
|
}
|
||||||
KeyManager keyManager =
|
KeyManager keyManager =
|
||||||
KeyChainKeyManager.fromAlias(context, hostAuth.mClientCertAlias);
|
KeyChainKeyManager.fromAlias(context, hostAuth.mClientCertAlias);
|
||||||
SSLCertificateSocketFactory underlying = SSLUtils.getSSLSocketFactory(context, hostAuth,
|
boolean insecure = hostAuth.shouldTrustAllServerCerts();
|
||||||
false);
|
SSLSocketFactory ssf =
|
||||||
underlying.setKeyManagers(new KeyManager[] { keyManager });
|
SSLUtils.getHttpSocketFactory(context, hostAuth, keyManager, insecure);
|
||||||
registry.register(
|
registry.register(new Scheme(schemeName, ssf, hostAuth.mPort));
|
||||||
new Scheme(schemeName, new SSLSocketFactory(underlying), hostAuth.mPort));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user