diff options
| author | Rubin Xu <rubinxu@google.com> | 2020-07-15 15:49:42 +0100 |
|---|---|---|
| committer | Rubin Xu <rubinxu@google.com> | 2020-07-15 15:50:14 +0100 |
| commit | ac51bf8a40d24e23e09974cbd0da2d0ecd32fde9 (patch) | |
| tree | 4649ff9f94510b428e181cbbda4b113b8c432c45 /core/proto | |
| parent | 944082eca5feede79e0dd0c6e8a892ef835c6872 (diff) | |
[DO NOT MERGE] Rollup changes from R related to CertInstaller and KeyChain
This change includes the following commits that are related to
CertInstaller and KeyChain:
7a5c8fe4afd KeyChain: Unify manual and programmatic key installation flows
a894225c7da Added functionality to select type of certificate to be installed from the Settings app
a9131939a35 Add KeyChain.KEY_ALIAS_SELECTION_DENIED constant.
485be505f19 Fix KeyChain.KEY_ALIAS_SELECTION_DENIED
Bug: 161347472
Test: builds & manual testing
Change-Id: I560bade479b41a5b88f81ea6dfdecba689c2f4ad
Diffstat (limited to 'core/proto')
| -rw-r--r-- | core/proto/android/app/settings_enums.proto | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto index 59797f7f4bf6..51266de83355 100644 --- a/core/proto/android/app/settings_enums.proto +++ b/core/proto/android/app/settings_enums.proto @@ -2422,6 +2422,11 @@ enum PageId { // OS: Q SETTINGS_GESTURE_TAP = 1751; + // OPEN: Settings > Security & screen lock -> Encryption & credentials > Install a certificate + // CATEGORY: SETTINGS + // OS: R + INSTALL_CERTIFICATE_FROM_STORAGE = 1803; + // OPEN: Settings > Developer Options > Platform Compat // CATEGORY: SETTINGS // OS: R |