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

Commit 5fa58b80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Identity Credential: Update docs to mention valid range for ACP identifiers." am: 642b4407 

Change-Id: I70c4915d9bbf926b576c1a9712d4ec06f1d60a26
parents 79ebf075 642b4407

identity/java/android/security/identity/AccessControlProfileId.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ public class AccessControlProfileId { 
    /**

     * 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.

     */

    public AccessControlProfileId(int id) {

identity/java/android/security/identity/IdentityCredentialStore.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import java.lang.annotation.RetentionPolicy; 
 * 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>

 *

 * <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>

 *

 * <li>An asymmetric key pair which is used to authenticate the credential to the Issuing