Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alex Johnston
2019-10-24 11:35:24 +00:00
committed by Android (Google) Code Review
parent c1de45a93b fde28690ff
commit 7e9642ed02
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/proto/android/app/settings_enums.proto
View File

@@ -2431,4 +2431,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;
}

14
keystore/java/android/security/Credentials.java
View File

@@ -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.
*/