Merge tag 'android-security-11.0.0_r49' into int/11/fp3
Android security 11.0.0 release 49
* tag 'android-security-11.0.0_r49':
Make mIsDeviceLockedForUser synchronized.
Change-Id: I90e8a95d5346ce3d99ac1d1cea2bc67796fc08ea
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);
}