ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Update message versionioning system" am: 00ed8bdddb

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16a5f9d80cebbcce1427a5c354df9f6903ffa52b
This commit is contained in:
Treehugger Robot 2020-12-15 02:01:32 +00:00 • committed by Automerger Merge Worker
commit 438b5d0317
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trusty/keymaster/set_attestation_key/set_attestation_key.cpp
View file

@ -70,7 +70,7 @@ static void parse_options(int argc, char** argv) {
}
struct SetAttestationKeyRequest : public keymaster::KeymasterMessage {
explicit SetAttestationKeyRequest(int32_t ver = keymaster::MAX_MESSAGE_VERSION)
explicit SetAttestationKeyRequest(int32_t ver = keymaster::kDefaultMessageVersion)
: KeymasterMessage(ver) {}
size_t SerializedSize() const override { return sizeof(uint32_t) + key_data.SerializedSize(); }
@ -88,7 +88,7 @@ struct SetAttestationKeyRequest : public keymaster::KeymasterMessage {
};
struct KeymasterNoResponse : public keymaster::KeymasterResponse {
explicit KeymasterNoResponse(int32_t ver = keymaster::MAX_MESSAGE_VERSION)
explicit KeymasterNoResponse(int32_t ver = keymaster::kDefaultMessageVersion)
: keymaster::KeymasterResponse(ver) {}
size_t NonErrorSerializedSize() const override { return 0; }
@ -99,7 +99,7 @@ struct KeymasterNoResponse : public keymaster::KeymasterResponse {
struct SetAttestationKeyResponse : public KeymasterNoResponse {};
struct ClearAttestationCertChainRequest : public keymaster::KeymasterMessage {
explicit ClearAttestationCertChainRequest(int32_t ver = keymaster::MAX_MESSAGE_VERSION)
explicit ClearAttestationCertChainRequest(int32_t ver = keymaster::kDefaultMessageVersion)
: KeymasterMessage(ver) {}
size_t SerializedSize() const override { return sizeof(uint32_t); }