Revert "btif: Short circuit NIAP key attestation check"

This reverts commit 24200b230ab9c5dec4f3f10a4b36cf7f84515e05.
Bug: 117993149

diff --git a/btif/src/btif_config.cc b/btif/src/btif_config.cc
index 1489537..7d23e34 100644 (file)
--- a/btif/src/btif_config.cc
+++ b/btif/src/btif_config.cc
@@ -60,16 +60,7 @@ static const char* TIME_STRING_FORMAT = "%Y-%m-%d %H:%M:%S";
 
 constexpr int kBufferSize = 400 * 10;  // initial file is ~400B
 
-static bool override_use_key_attestation() {
-  char key_attestation[PROPERTY_VALUE_MAX] = {0};
-  osi_property_get("persist.bluetooth.use_key_attestation", key_attestation, "false");
-  return strncmp(key_attestation, "true", 4) == 0;
-}
-
-static bool use_key_attestation() {
-  // Short circuiting until keystore issue is fixed
-  return getuid() == AID_BLUETOOTH /* remove if keystore fixed */ && override_use_key_attestation();
-}
+static bool use_key_attestation() { return getuid() == AID_BLUETOOTH; }
 
 #define BT_CONFIG_METRICS_SECTION "Metrics"
 #define BT_CONFIG_METRICS_SALT_256BIT "Salt256Bit"