Use fully-qualified names instead of read and write.
This one's for you, Paul!
Test: Build
Change-Id: I44d0c05427a897e7d3d35ae2c8b9aa952920e661
diff --git a/keystore2/src/metrics_store.rs b/keystore2/src/metrics_store.rs
index 564ab66..4634da1 100644
--- a/keystore2/src/metrics_store.rs
+++ b/keystore2/src/metrics_store.rs
@@ -49,7 +49,7 @@
use std::collections::HashMap;
use std::sync::Mutex;
use std::time::{Duration, SystemTime, UNIX_EPOCH};
-use system_properties::{read, write, PropertyWatcherError};
+use system_properties::PropertyWatcherError;
// Note: Crash events are recorded at keystore restarts, based on the assumption that keystore only
// gets restarted after a crash, during a boot cycle.
@@ -626,7 +626,8 @@
}
};
- if let Err(e) = write(KEYSTORE_CRASH_COUNT_PROPERTY, &new_count.to_string()) {
+ if let Err(e) = system_properties::write(KEYSTORE_CRASH_COUNT_PROPERTY, &new_count.to_string())
+ {
log::error!(
concat!(
"In update_keystore_crash_sysprop:: ",
@@ -639,7 +640,7 @@
/// Read the system property: keystore.crash_count.
pub fn read_keystore_crash_count() -> Result<i32> {
- read("keystore.crash_count")
+ system_properties::read("keystore.crash_count")
.context("In read_keystore_crash_count: Failed read property.")?
.parse::<i32>()
.map_err(std::convert::Into::into)