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

Commit 25eff773 authored by Paul Stewart's avatar Paul Stewart Committed by android-build-merger
Browse files

Account for null client certificate am: 1ca57a1d 

am: 4ad314b4

Change-Id: I50138c766a4ca1f697bbe4c2285bc0bc8c2985f4
parents 80b57936 4ad314b4

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);

    }



    /**