Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7ac5d79 authored by Martin Brabham's avatar Martin Brabham Committed by android-build-merger
Browse files

Revert "btif: Short circuit NIAP key attestation check"

am: 88b78f69

Change-Id: I4ff7b873c77f38c6f2127bb34582fe6bde2f433e
parents bba97b17 88b78f69
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
@@ -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"