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

Commit 30f847fa authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Fix TODOs in public doc comments." am: 12ddcc88 am:... 

Merge "Keystore 2.0: Fix TODOs in public doc comments." am: 12ddcc88 am: f81dbc08 am: 9fbbc616

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626281

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85945d2c9d6fe178d4a3dd6dece03c06c8ff60b8
parents b5172115 9fbbc616

keystore/java/android/security/keystore/KeyGenParameterSpec.java

+5 −5
Original line number Diff line number Diff line
@@ -467,8 +467,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
     *

     * @return The numeric namespace as configured in the keystore2_key_contexts files of Android's

     *         SEPolicy.

     *         TODO b/171806779 link to public Keystore 2.0 documentation.

     *              See bug for more details for now.

     *         See <a href="https://source.android.com/security/keystore#access-control">

     *             Keystore 2.0 access control</a>

     * @hide

     */

    @SystemApi
@@ -1043,8 +1043,8 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu 
         *

         * @param namespace Numeric SELinux namespace as configured in keystore2_key_contexts

         *         of Android's SEPolicy.

         *                  TODO b/171806779 link to public Keystore 2.0 documentation.

         *                       See bug for more details for now.

         *         See <a href="https://source.android.com/security/keystore#access-control">

         *             Keystore 2.0 access control</a>

         * @return this Builder object.

         *

         * @hide

keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java

+5 −5
Original line number Diff line number Diff line
@@ -343,8 +343,8 @@ public class AndroidKeyStoreProvider extends Provider { 
     *         Android system specific keystore namespace, which can be configured

     *         in the device's SEPolicy. Third party apps and most system components

     *         set this parameter to -1 to indicate their application specific namespace.

     *                  TODO b/171806779 link to public Keystore 2.0 documentation.

     *                       See bug for more details for now.

     *         See <a href="https://source.android.com/security/keystore#access-control">

     *             Keystore 2.0 access control</a>

     * @hide

     **/

    @NonNull