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

[DO NOT MERGE] Rollup Cert-related changes from R

Browse Source 
This change includes the following commits from internal R branch
which are related to certificate management:

0206e76f46 CredentialStorage: Install keys using KeyChain
09ceea53d9 Added functionality to select type of certificate to be installed from the Settings app
3acf3f5433 WiFi certificates installable from Wifi sub-preference
8439fd15f7 Fix strings for certificate installation in Settings

Bug: 161347472
Test: builds & manual testing
Change-Id: Ia59dc4780254fab4f34c2f61b25f3b4e56ed7b77
This commit is contained in:
Eran Messeri
2019-09-10 17:40:28 +01:00
committed by Rubin Xu
parent 268371c44e
commit f37c8cb4f7
13 changed files with 485 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/security/EncryptionAndCredential.java
View File

@@ -76,7 +76,7 @@ public class EncryptionAndCredential extends DashboardFragment {
controllers.add(new CredentialStoragePreferenceController(context));
controllers.add(new UserCredentialsPreferenceController(context));
controllers.add(new ResetCredentialsPreferenceController(context, lifecycle));
controllers.add(new InstallCredentialsPreferenceController(context));
controllers.add(new InstallCertificatePreferenceController(context));
return controllers;
}