commit eb4a5a5d704b4dca7f236537d0d5653b6b77e9ef
author Hasini Gunasinghe <hasinitg@google.com> Tue Oct 06 21:54:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 06 21:54:08 2020 +0000
tree 0dd87587a937daaeca7db4fbe5f264a1c9c60f22
parent a5562fae1dec851ffca48131af774d4e11eff700
parent 6214d7d3ad9c28a37fce4ee979985ed50ddf0556

Merge "Pass default values for the optional fields in attestation logs" am: 6214d7d3ad

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1448835

Change-Id: I6289f63a9188f87c48f33127c9bcd931919e491e

keystore/key_attestation_log_handler.cpp

diff --git a/keystore/key_attestation_log_handler.cpp b/keystore/key_attestation_log_handler.cpp
index 34c76a3..c3278cb 100644
--- a/keystore/key_attestation_log_handler.cpp
+++ b/keystore/key_attestation_log_handler.cpp
@@ -17,7 +17,11 @@
 namespace keystore {
 
 void logKeystoreKeyAttestationEvent(bool wasSuccessful, int32_t errorCode) {
-    android::util::stats_write(android::util::KEYSTORE_KEY_EVENT_REPORTED,
+    // Due to a requirement in stats-write() method, the optional fields
+    // which are not required for attestation logging, are marked with -1 for
+    // non-repeated fields and 0 for repeated fields.
+    android::util::stats_write(android::util::KEYSTORE_KEY_EVENT_REPORTED, -1, -1, -1, -1, -1, 0, 0,
+                               0, 0, -1, -1,
                                android::util::KEYSTORE_KEY_EVENT_REPORTED__TYPE__KEY_ATTESTATION,
                                wasSuccessful, errorCode);
 }