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

Commit 7161c324 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "aidl: Suppress warnings on out-array" am: b4be35f8 am: b3c0ff4d am:... 

Merge "aidl: Suppress warnings on out-array" am: b4be35f8 am: b3c0ff4d am: 75c90e37 am: 5a9aaf25

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1687505

Change-Id: I38c4da79cadbabb7605a7e10439a2a885dd8aeb1
parents d04286b9 5a9aaf25

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/IIdentityCredential.aidl

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ interface IIdentityCredential { 
  void startRetrieval(in android.hardware.identity.SecureAccessControlProfile[] accessControlProfiles, in android.hardware.keymaster.HardwareAuthToken authToken, in byte[] itemsRequest, in byte[] signingKeyBlob, in byte[] sessionTranscript, in byte[] readerSignature, in int[] requestCounts);

  void startRetrieveEntryValue(in @utf8InCpp String nameSpace, in @utf8InCpp String name, in int entrySize, in int[] accessControlProfileIds);

  byte[] retrieveEntryValue(in byte[] encryptedContent);

  void finishRetrieval(out byte[] mac, out byte[] deviceNameSpaces);

  android.hardware.identity.Certificate generateSigningKeyPair(out byte[] signingKeyBlob);

  @SuppressWarnings(value={"out-array"}) void finishRetrieval(out byte[] mac, out byte[] deviceNameSpaces);

  @SuppressWarnings(value={"out-array"}) android.hardware.identity.Certificate generateSigningKeyPair(out byte[] signingKeyBlob);

  void setRequestedNamespaces(in android.hardware.identity.RequestNamespace[] requestNamespaces);

  void setVerificationToken(in android.hardware.keymaster.VerificationToken verificationToken);

  byte[] deleteCredentialWithChallenge(in byte[] challenge);

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/IWritableIdentityCredential.aidl

+1 −1
Original line number Diff line number Diff line
@@ -38,6 +38,6 @@ interface IWritableIdentityCredential { 
  android.hardware.identity.SecureAccessControlProfile addAccessControlProfile(in int id, in android.hardware.identity.Certificate readerCertificate, in boolean userAuthenticationRequired, in long timeoutMillis, in long secureUserId);

  void beginAddEntry(in int[] accessControlProfileIds, in @utf8InCpp String nameSpace, in @utf8InCpp String name, in int entrySize);

  byte[] addEntryValue(in byte[] content);

  void finishAddingEntries(out byte[] credentialData, out byte[] proofOfProvisioningSignature);

  @SuppressWarnings(value={"out-array"}) void finishAddingEntries(out byte[] credentialData, out byte[] proofOfProvisioningSignature);

  void setExpectedProofOfProvisioningSize(in int expectedProofOfProvisioningSize);

}

identity/aidl/android/hardware/identity/IIdentityCredential.aidl

+2 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ interface IIdentityCredential { 
     *

     * @param out deviceNameSpaces the bytes of DeviceNameSpaces.

     */

    @SuppressWarnings(value={"out-array"})

    void finishRetrieval(out byte[] mac, out byte[] deviceNameSpaces);



    /**
@@ -376,6 +377,7 @@ interface IIdentityCredential { 
     *

     * @return an X.509 certificate for the new signing key, signed by the credential key.

     */

    @SuppressWarnings(value={"out-array"})

    Certificate generateSigningKeyPair(out byte[] signingKeyBlob);



    /**

identity/aidl/android/hardware/identity/IWritableIdentityCredential.aidl

+1 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ interface IWritableIdentityCredential { 
     *              "accessControlProfiles" : [ * uint ],

     *          }

     */

    @SuppressWarnings(value={"out-array"})

    void finishAddingEntries(out byte[] credentialData,

        out byte[] proofOfProvisioningSignature);