Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Account for null client certificate am: 1ca57a1d10 am: 4ad314b463

Browse Source 
am: 25eff7731a

Change-Id: I2bd868e534ca1a5960ac9855bd40a91f705b9772
This commit is contained in:
Paul Stewart
2017-01-28 02:00:50 +00:00
committed by android-build-merger
parent 9c9d4f6f6d 25eff7731a
commit b35b219516
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -752,8 +752,11 @@ public class WifiEnterpriseConfig implements Parcelable {
* @throws IllegalArgumentException for an invalid key or certificate. * @throws IllegalArgumentException for an invalid key or certificate.
*/ */
public void setClientKeyEntry(PrivateKey privateKey, X509Certificate clientCertificate) { public void setClientKeyEntry(PrivateKey privateKey, X509Certificate clientCertificate) {
setClientKeyEntryWithCertificateChain(privateKey, X509Certificate[] clientCertificates = null;
new X509Certificate[] {clientCertificate}); if (clientCertificate != null) {
clientCertificates = new X509Certificate[] {clientCertificate};
}
setClientKeyEntryWithCertificateChain(privateKey, clientCertificates);
} }
/** /**