Merge "aidl: Suppress warnings on out-array"

This commit is contained in:
Jooyung Han 2021-04-27 22:47:15 +00:00 committed by Gerrit Code Review
commit b4be35f854
4 changed files with 6 additions and 3 deletions

View file

@ -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 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); void startRetrieveEntryValue(in @utf8InCpp String nameSpace, in @utf8InCpp String name, in int entrySize, in int[] accessControlProfileIds);
byte[] retrieveEntryValue(in byte[] encryptedContent); byte[] retrieveEntryValue(in byte[] encryptedContent);
void finishRetrieval(out byte[] mac, out byte[] deviceNameSpaces); @SuppressWarnings(value={"out-array"}) void finishRetrieval(out byte[] mac, out byte[] deviceNameSpaces);
android.hardware.identity.Certificate generateSigningKeyPair(out byte[] signingKeyBlob); @SuppressWarnings(value={"out-array"}) android.hardware.identity.Certificate generateSigningKeyPair(out byte[] signingKeyBlob);
void setRequestedNamespaces(in android.hardware.identity.RequestNamespace[] requestNamespaces); void setRequestedNamespaces(in android.hardware.identity.RequestNamespace[] requestNamespaces);
void setVerificationToken(in android.hardware.keymaster.VerificationToken verificationToken); void setVerificationToken(in android.hardware.keymaster.VerificationToken verificationToken);
byte[] deleteCredentialWithChallenge(in byte[] challenge); byte[] deleteCredentialWithChallenge(in byte[] challenge);

View file

@ -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); 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); void beginAddEntry(in int[] accessControlProfileIds, in @utf8InCpp String nameSpace, in @utf8InCpp String name, in int entrySize);
byte[] addEntryValue(in byte[] content); 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); void setExpectedProofOfProvisioningSize(in int expectedProofOfProvisioningSize);
} }

View file

@ -324,6 +324,7 @@ interface IIdentityCredential {
* *
* @param out deviceNameSpaces the bytes of DeviceNameSpaces. * @param out deviceNameSpaces the bytes of DeviceNameSpaces.
*/ */
@SuppressWarnings(value={"out-array"})
void finishRetrieval(out byte[] mac, out byte[] deviceNameSpaces); 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. * @return an X.509 certificate for the new signing key, signed by the credential key.
*/ */
@SuppressWarnings(value={"out-array"})
Certificate generateSigningKeyPair(out byte[] signingKeyBlob); Certificate generateSigningKeyPair(out byte[] signingKeyBlob);
/** /**

View file

@ -320,6 +320,7 @@ interface IWritableIdentityCredential {
* "accessControlProfiles" : [ * uint ], * "accessControlProfiles" : [ * uint ],
* } * }
*/ */
@SuppressWarnings(value={"out-array"})
void finishAddingEntries(out byte[] credentialData, void finishAddingEntries(out byte[] credentialData,
out byte[] proofOfProvisioningSignature); out byte[] proofOfProvisioningSignature);