summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHasini Gunasinghe <hasinitg@google.com>2021-08-05 21:32:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-05 21:32:56 +0000
commitb90a0c8680e26f05fe25456fe00dfa5a43e01f37 (patch)
tree1999a302cc1601f63d04f6aac81d703c805ecab2
parente546e8a78bd27c5c730c65bc13a442b25c2a8b1b (diff)
parentac057d3a9945bf2f0c7ce3ad06eb969d67db0d17 (diff)
downloadsecurity-b90a0c8680e26f05fe25456fe00dfa5a43e01f37.tar.gz
Log metrics for RKP fallback event. am: ac057d3a99
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/15433979 Change-Id: Ica677e4a00aa28ec2a574175d44e9a7e4f8f07ee
-rw-r--r--keystore2/src/remote_provisioning.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/keystore2/src/remote_provisioning.rs b/keystore2/src/remote_provisioning.rs
index 12364317..212bf399 100644
--- a/keystore2/src/remote_provisioning.rs
+++ b/keystore2/src/remote_provisioning.rs
@@ -43,7 +43,9 @@ use std::sync::atomic::{AtomicBool, Ordering};
use crate::database::{CertificateChain, KeystoreDB, Uuid};
use crate::error::{self, map_or_log_err, map_rem_prov_error, Error};
use crate::globals::{get_keymint_device, get_remotely_provisioned_component, DB};
+use crate::metrics_store::log_rkp_error_stats;
use crate::utils::{watchdog as wd, Asp};
+use android_security_metrics::aidl::android::security::metrics::RkpError::RkpError as MetricsRkpError;
/// Contains helper functions to check if remote provisioning is enabled on the system and, if so,
/// to assign and retrieve attestation keys and certificate chains.
@@ -189,6 +191,7 @@ impl RemProvState {
),
e
);
+ log_rkp_error_stats(MetricsRkpError::FALL_BACK_DURING_HYBRID);
Ok(None)
}
Ok(v) => match v {