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

Merge "Identity Credential: Update docs to mention valid range for ACP identifiers." into rvc-dev am: b45c49b0cf am: a1761e8415

Browse Source 
Change-Id: I91548b72b6959da7cbff8b9dc5a709d499b40ea8
This commit is contained in:
TreeHugger Robot
2020-04-27 22:24:39 +00:00
committed by Automerger Merge Worker
parent 6e4c7c6b11 a1761e8415
commit 2c695a83b6
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
identity/java/android/security/identity/AccessControlProfileId.java
View File

@@ -25,6 +25,8 @@ public class AccessControlProfileId {
/** /**
* Constructs a new object holding a numerical identifier. * Constructs a new object holding a numerical identifier.
* *
* <p>The identifier must be a non-negative number and less than 32.
*
* @param id the identifier. * @param id the identifier.
*/ */
public AccessControlProfileId(int id) { public AccessControlProfileId(int id) {

2
identity/java/android/security/identity/IdentityCredentialStore.java
View File

@@ -46,7 +46,7 @@ import java.lang.annotation.RetentionPolicy;
* access control profile IDs. Names are strings and values are typed and can be any * access control profile IDs. Names are strings and values are typed and can be any
* value supported by <a href="http://cbor.io/">CBOR</a>.</li> * value supported by <a href="http://cbor.io/">CBOR</a>.</li>
* *
* <li>A set of access control profiles, each with a profile ID and a specification * <li>A set of access control profiles (up to 32), each with a profile ID and a specification
* of the conditions which satisfy the profile's requirements.</li> * of the conditions which satisfy the profile's requirements.</li>
* *
* <li>An asymmetric key pair which is used to authenticate the credential to the Issuing * <li>An asymmetric key pair which is used to authenticate the credential to the Issuing