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

Commit 3e2045d2 authored by Hai Shalom's avatar Hai Shalom Committed by Automerger Merge Worker
Browse files

Merge "Make app installed cert flags persistent" into mainline-prod am: a3767c21 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12829570

Change-Id: I6ce56a285fdea03c1b685ac3f2f193adf3417058
parents e902a646 a3767c21

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

+20 −0
Original line number Diff line number Diff line
@@ -1334,6 +1334,16 @@ public class WifiEnterpriseConfig implements Parcelable { 
        return mIsAppInstalledDeviceKeyAndCert;

    }



    /**

     * Initialize the value of the app installed device key and cert flag.

     *

     * @param isAppInstalledDeviceKeyAndCert true or false

     * @hide

     */

    public void initIsAppInstalledDeviceKeyAndCert(boolean isAppInstalledDeviceKeyAndCert) {

        mIsAppInstalledDeviceKeyAndCert = isAppInstalledDeviceKeyAndCert;

    }



    /**

     * Check if CA certificate was installed by an app, or manually (not by an app). If true,

     * CA certificate will be removed from key storage when this network is removed. If not,
@@ -1347,6 +1357,16 @@ public class WifiEnterpriseConfig implements Parcelable { 
        return mIsAppInstalledCaCert;

    }



    /**

     * Initialize the value of the app installed root CA cert flag.

     *

     * @param isAppInstalledCaCert true or false

     * @hide

     */

    public void initIsAppInstalledCaCert(boolean isAppInstalledCaCert) {

        mIsAppInstalledCaCert = isAppInstalledCaCert;

    }



    /**

     * Set the OCSP type.

     * @param ocsp is one of {@link ##OCSP_NONE}, {@link #OCSP_REQUEST_CERT_STATUS},