Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f5d1ec2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Account for null client certificate"

parents 0ee455a8 410a3498

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

+5 −2
Original line number Diff line number Diff line
@@ -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);

    }



    /**