Merge "Keystore 2.0: Fix TODOs in public doc comments." (12ddcc88) · Commits · e / os / android_frameworks_base

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

+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