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

Commit fd8d6fdc 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... 

Merge "Identity Credential: Update docs to mention valid range for ACP identifiers." into rvc-dev am: b45c49b0 am: a1761e84 am: 2c695a83

Change-Id: Ia65a75a5b170d4653985339d52f2cb2b6de8505a
parents 52c1c27b 2c695a83

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