diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto index 94be61f40eae7..ea0b3bfa3c200 100644 --- a/core/proto/android/app/settings_enums.proto +++ b/core/proto/android/app/settings_enums.proto @@ -2426,4 +2426,9 @@ enum PageId { // and under gesture navigation mode. DIALOG_TOGGLE_SCREEN_MAGNIFICATION_GESTURE_NAVIGATION = 1802; + // OPEN: Settings > Security & screen lock -> Encryption & credentials > Install a certificate + // CATEGORY: SETTINGS + // OS: R + INSTALL_CERTIFICATE_FROM_STORAGE = 1803; + } diff --git a/keystore/java/android/security/Credentials.java b/keystore/java/android/security/Credentials.java index 54995ac9d0509..f25910beb537e 100644 --- a/keystore/java/android/security/Credentials.java +++ b/keystore/java/android/security/Credentials.java @@ -71,6 +71,15 @@ public class Credentials { /** Key containing suffix of lockdown VPN profile. */ public static final String LOCKDOWN_VPN = "LOCKDOWN_VPN"; + /** Name of CA certificate usage. */ + public static final String CERTIFICATE_USAGE_CA = "ca"; + + /** Name of User certificate usage. */ + public static final String CERTIFICATE_USAGE_USER = "user"; + + /** Name of WIFI certificate usage. */ + public static final String CERTIFICATE_USAGE_WIFI = "wifi"; + /** Data type for public keys. */ public static final String EXTRA_PUBLIC_KEY = "KEY"; @@ -90,6 +99,11 @@ public class Credentials { */ public static final String EXTRA_INSTALL_AS_UID = "install_as_uid"; + /** + * Intent extra: type of the certificate to install + */ + public static final String EXTRA_CERTIFICATE_USAGE = "certificate_install_usage"; + /** * Intent extra: name for the user's key pair. */