commit 3ad7162c29db781d9511ec45d48cc1f8dec74f33
author android-build-team Robot <android-build-team-robot@google.com> Thu Oct 15 23:09:01 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Oct 15 23:09:01 2020 +0000
tree 0fd039662d4e3e03b583a1b558e813878c147a10
parent dea036920cee1f548334be13b7c45c46279d5c8f
parent 8cf12600c8d1eab10fa76e54380a462e4f832974

Snap for 6908631 from 8cf12600c8d1eab10fa76e54380a462e4f832974 to rvc-qpr2-release

Change-Id: I07567f355934788cd30c97601ce01cfeff5e6fb7

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);
 }