Merge "Make app installed cert flags persistent" into mainline-prod (a3767c21) · Commits · e / os / android_frameworks_base

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},