Merge "Account for null client certificate"

2017-01-27 20:46:15 +00:00
parent 0ee455a899 410a3498ac
commit 3f5d1ec256
1 changed files with 5 additions and 2 deletions
--- 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);
    }

    /**