commit c5fa3c5375a7d13919846adac1e039287648dbc2
author Hasini Gunasinghe <hasinitg@google.com> Fri Nov 06 16:23:37 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 06 16:23:37 2020 +0000
tree fb3153700f802e95fac619faceab30315c26248c
parent 9a71e463ba39731e440692537dcbc0ca76b6f418
parent 6261b5e6b3b82d005fa2391c082eb8ed96079c15

Make mIsDeviceLockedForUser synchronized. am: 8696c2ca1b am: 19e17f0981 am: f7d50266fc am: 6261b5e6b3

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

Change-Id: Ia7b1de462d0ae491a2a338f7805c1ffdf142ad43

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