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

Commit 3e62bed4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update KeyChain.createInstallIntent documentation" into rvc-dev am: 0bada478 

Change-Id: If7d2cb24b71dbe0332844f2d149621355d9caaed
parents e117bd02 0bada478

keystore/java/android/security/KeyChain.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -369,6 +369,13 @@ public final class KeyChain { 
     * {@link Activity#RESULT_OK} will be returned if a credential was

     * {@link Activity#RESULT_OK} will be returned if a credential was

     * successfully installed, otherwise {@link

     * successfully installed, otherwise {@link

     * Activity#RESULT_CANCELED} will be returned.

     * Activity#RESULT_CANCELED} will be returned.

     *

     * <p>Starting from {@link android.os.Build.VERSION_CODES#R}, the intent returned by this

     * method cannot be used for installing CA certificates. Since CA certificates can only be

     * installed via Settings, the app should provide the user with a file containing the

     * CA certificate. One way to do this would be to use the {@link android.provider.MediaStore}

     * API to write the certificate to the {@link android.provider.MediaStore.Downloads}

     * collection.

     */

     */

    @NonNull

    @NonNull

    public static Intent createInstallIntent() {

    public static Intent createInstallIntent() {