diff options
| author | 2017-01-28 01:53:52 +0000 | |
|---|---|---|
| committer | 2017-01-28 01:53:52 +0000 | |
| commit | 25eff7731a498e08ca7d95e9c764cab3bc68aca9 (patch) | |
| tree | 5820e0c73b4d3591b0c580a34c9d4a4db72a9c2c | |
| parent | 80b57936457d60ed494431743a44951cbef64336 (diff) | |
| parent | 4ad314b463eb4590dd80a757578d6eabd052215a (diff) | |
Account for null client certificate am: 1ca57a1d10
am: 4ad314b463
Change-Id: I50138c766a4ca1f697bbe4c2285bc0bc8c2985f4
| -rw-r--r-- | wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 5028d47481b0..0bfb95581e60 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -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); } /** |