f37c8cb4f7
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
66 lines
2.4 KiB
XML
66 lines
2.4 KiB
XML
<!--
|
|
~ Copyright (C) 2019 The Android Open Source Project
|
|
~
|
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
|
~ you may not use this file except in compliance with the License.
|
|
~ You may obtain a copy of the License at
|
|
~
|
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
|
~
|
|
~ Unless required by applicable law or agreed to in writing, software
|
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
~ See the License for the specific language governing permissions and
|
|
~ limitations under the License.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/credentials_install">
|
|
|
|
<PreferenceCategory
|
|
android:key="certificate_types">
|
|
|
|
<Preference
|
|
android:key="install_ca_certificate"
|
|
android:title="@string/ca_certificate">
|
|
|
|
<intent
|
|
android:targetPackage="com.android.settings"
|
|
android:targetClass="com.android.settings.security.InstallCaCertificateWarning">
|
|
</intent>
|
|
|
|
</Preference>
|
|
|
|
<Preference
|
|
android:key="install_user_certificate"
|
|
android:title="@string/user_certificate">
|
|
|
|
<intent
|
|
android:action="android.credentials.INSTALL"
|
|
android:targetPackage="com.android.certinstaller"
|
|
android:targetClass="com.android.certinstaller.CertInstallerMain">
|
|
<!-- Same value as CERTIFICATE_USAGE_USER in keystore/java/android/security/Credentials.java -->
|
|
<extra android:name="certificate_install_usage" android:value="user"/>
|
|
</intent>
|
|
|
|
</Preference>
|
|
|
|
<Preference
|
|
android:key="install_wifi_certificate"
|
|
android:title="@string/wifi_certificate">
|
|
|
|
<intent
|
|
android:action="android.credentials.INSTALL"
|
|
android:targetPackage="com.android.certinstaller"
|
|
android:targetClass="com.android.certinstaller.CertInstallerMain">
|
|
<!-- Same value as CERTIFICATE_USAGE_WIFI in keystore/java/android/security/Credentials.java -->
|
|
<extra android:name="certificate_install_usage" android:value="wifi"/>
|
|
</intent>
|
|
|
|
</Preference>
|
|
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen> |