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

Commit 4ad314b4 authored by Paul Stewart's avatar Paul Stewart Committed by android-build-merger
Browse files

Account for null client certificate

am: 1ca57a1d

Change-Id: Id999634bb25a379a5cfdb47412323d2cc6d0cd30
parents cd463ff2 1ca57a1d
Loading
Loading
Loading
Loading
+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);
    }

    /**