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

Commit fde28690 authored by Alex Johnston's avatar Alex Johnston
Browse files

Added functionality to select type of certificate to be installed from the Settings app 

This is part of the changes to improve the UX and language for installing certificates.
Previously, the different types of certificate used the same installation flow. This CL
introduces a new settings page, where the type of certificate to be installed can be selected.

Bug: 139173976
Test: Atest com.android.settings.security
      manual testing from Settings by selecting the certificate type
	preference and ensuring the installation flow still worked as expected.

Change-Id: I6e0606b00c5f684571ffbd903b9cf55c6911fd0f
parent 2f5062a1

core/proto/android/app/settings_enums.proto

+5 −0
Original line number Diff line number Diff line
@@ -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;



}

keystore/java/android/security/Credentials.java

+14 −0
Original line number Diff line number Diff line
@@ -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.

     */