commit f02e4d6af2c7fcbaec7b1380867788c6a580e43c
author Tri Vo <trong@google.com> Mon Jan 30 16:05:29 2023 -0800
committer Tri Vo <trong@google.com> Tue Jan 31 13:59:39 2023 -0800
tree 1ca1c87aa2c6d4092662277ab44c9cdecd2f2f9f
parent e5f44a081d30d2e301018715b9c6fc90bd387b2c

Make RKPD default

Also, remove usage of
"persist.device_config.remote_key_provisioning_native.enable_rkpd".

Test: keystore2_test
Change-Id: I3e6673f1af45adf7f7075e61523621ac9377f414

identity/CredentialStore.cpp

diff --git a/identity/CredentialStore.cpp b/identity/CredentialStore.cpp
index fea4df9..e2b3cf4 100644
--- a/identity/CredentialStore.cpp
+++ b/identity/CredentialStore.cpp
@@ -47,7 +47,7 @@
 
 bool useRkpd() {
     return android::base::GetBoolProperty("remote_provisioning.enable_rkpd",
-                                          /*default_value=*/false);
+                                          /*default_value=*/true);
 }
 
 }  // namespace

keystore2/src/attestation_key_utils.rs

diff --git a/keystore2/src/attestation_key_utils.rs b/keystore2/src/attestation_key_utils.rs
index d31fa82..8c4cdea 100644
--- a/keystore2/src/attestation_key_utils.rs
+++ b/keystore2/src/attestation_key_utils.rs
@@ -54,11 +54,9 @@
 }
 
 fn use_rkpd() -> bool {
-    let mutable_property = "persist.device_config.remote_key_provisioning_native.enable_rkpd";
-    let fixed_property = "remote_provisioning.enable_rkpd";
-    let default_value = false;
-    system_properties::read_bool(mutable_property, default_value).unwrap_or(default_value)
-        || system_properties::read_bool(fixed_property, default_value).unwrap_or(default_value)
+    let property = "remote_provisioning.enable_rkpd";
+    let default_value = true;
+    system_properties::read_bool(property, default_value).unwrap_or(default_value)
 }
 
 /// This function loads and, optionally, assigns the caller's remote provisioned