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

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

Browse Source
This commit is contained in:
Janis Danisevskis
2021-03-11 06:19:34 +00:00
committed by Gerrit Code Review
parent f0f69b46e2 274a93e953
commit 12ddcc8874
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
keystore/java/android/security/keystore/KeyGenParameterSpec.java
View File

@@ -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 * @return The numeric namespace as configured in the keystore2_key_contexts files of Android's
* SEPolicy. * SEPolicy.
* TODO b/171806779 link to public Keystore 2.0 documentation. * See <a href="https://source.android.com/security/keystore#access-control">
* See bug for more details for now. * Keystore 2.0 access control</a>
* @hide * @hide
*/ */
@SystemApi @SystemApi
@@ -1042,9 +1042,9 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu
* keys between system and vendor components, e.g., WIFI settings and WPA supplicant. * keys between system and vendor components, e.g., WIFI settings and WPA supplicant.
* *
* @param namespace Numeric SELinux namespace as configured in keystore2_key_contexts * @param namespace Numeric SELinux namespace as configured in keystore2_key_contexts
* of Android's SEPolicy. * of Android's SEPolicy.
* TODO b/171806779 link to public Keystore 2.0 documentation. * See <a href="https://source.android.com/security/keystore#access-control">
* See bug for more details for now. * Keystore 2.0 access control</a>
* @return this Builder object. * @return this Builder object.
* *
* @hide * @hide

10
keystore/java/android/security/keystore2/AndroidKeyStoreProvider.java
View File

@@ -340,11 +340,11 @@ public class AndroidKeyStoreProvider extends Provider {
* @param keyStore The keystore2 backend. * @param keyStore The keystore2 backend.
* @param alias The alias of the key in the Keystore database. * @param alias The alias of the key in the Keystore database.
* @param namespace The a Keystore namespace. This is used by system api only to request * @param namespace The a Keystore namespace. This is used by system api only to request
* Android system specific keystore namespace, which can be configured * Android system specific keystore namespace, which can be configured
* in the device's SEPolicy. Third party apps and most system components * in the device's SEPolicy. Third party apps and most system components
* set this parameter to -1 to indicate their application specific namespace. * set this parameter to -1 to indicate their application specific namespace.
* TODO b/171806779 link to public Keystore 2.0 documentation. * See <a href="https://source.android.com/security/keystore#access-control">
* See bug for more details for now. * Keystore 2.0 access control</a>
* @hide * @hide
**/ **/
@NonNull @NonNull