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

Account for null client certificate am: 1ca57a1d10

Browse Source 
am: 4ad314b463

Change-Id: I50138c766a4ca1f697bbe4c2285bc0bc8c2985f4
This commit is contained in:
Paul Stewart
2017-01-28 01:53:52 +00:00
committed by android-build-merger
parent 80b5793645 4ad314b463
commit 25eff7731a
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.
*/
public void setClientKeyEntry(PrivateKey privateKey, X509Certificate clientCertificate) {
setClientKeyEntryWithCertificateChain(privateKey,
new X509Certificate[] {clientCertificate});
X509Certificate[] clientCertificates = null;
if (clientCertificate != null) {
clientCertificates = new X509Certificate[] {clientCertificate};
}
setClientKeyEntryWithCertificateChain(privateKey, clientCertificates);
}
/**