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

Commit fc46475f authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)"

parents b22d6c11 fcdccac4

keystore/java/android/security/KeyChain.java

+0 −9
Original line number Diff line number Diff line
@@ -224,9 +224,6 @@ public final class KeyChain { 
     * <p>{@code alias} allows the chooser to preselect an existing

     * alias which will still be subject to user confirmation.

     *

     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#USE_CREDENTIALS}.

     *

     * @param activity The {@link Activity} context to use for

     *     launching the new sub-Activity to prompt the user to select

     *     a private key; used only to call startActivity(); must not
@@ -294,9 +291,6 @@ public final class KeyChain { 
     * Returns the {@code PrivateKey} for the requested alias, or null

     * if no there is no result.

     *

     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#USE_CREDENTIALS}.

     *

     * @param alias The alias of the desired private key, typically

     * returned via {@link KeyChainAliasCallback#alias}.

     * @throws KeyChainException if the alias was valid but there was some problem accessing it.
@@ -325,9 +319,6 @@ public final class KeyChain { 
     * Returns the {@code X509Certificate} chain for the requested

     * alias, or null if no there is no result.

     *

     * <p>This method requires the caller to hold the permission

     * {@link android.Manifest.permission#USE_CREDENTIALS}.

     *

     * @param alias The alias of the desired certificate chain, typically

     * returned via {@link KeyChainAliasCallback#alias}.

     * @throws KeyChainException if the alias was valid but there was some problem accessing it.