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

Commit 8038c20d authored by Martin Brabham's avatar Martin Brabham Committed by Cheney Ni
Browse files

Revert "Confirm the presence of BT key when BT ON" 

This reverts commit 6fb3d95a.

Bug: 139930706
Test: Manual
Change-Id: Ie80622782563bd38ee3421e7d3585ebd112482bf
(cherry picked from commit ae055008f4cc8e0a06dd9cf7a473d94b1c2bbcfd)
parent 5f49b028

system/btif/include/btif_keystore.h

+0 −8
Original line number Diff line number Diff line
@@ -59,14 +59,6 @@ class BtifKeystore { 
   */

  std::string Decrypt(const std::string& input_filename);



  /**

   * Check for existence of keystore key.

   *

   * This key can be cleared if a user manually wipes bluetooth storage data

   * b/133214365

   */

  bool DoesKeyExist();



 private:

  std::unique_ptr<keystore::KeystoreClient> keystore_client_;

  std::mutex api_mutex_;

system/btif/src/btif_config.cc

+1 −3
Original line number Diff line number Diff line
@@ -183,9 +183,7 @@ static BtifKeystore btif_keystore(new keystore::KeystoreClientImpl); 
static future_t* init(void) {

  std::unique_lock<std::recursive_mutex> lock(config_lock);



  if (is_factory_reset() ||

      (use_key_attestation() && !btif_keystore.DoesKeyExist()))

    delete_config_files();

  if (is_factory_reset()) delete_config_files();



  std::string file_source;

system/btif/src/btif_keystore.cc

+0 −4
Original line number Diff line number Diff line
@@ -98,8 +98,4 @@ KeyStoreNativeReturnCode BtifKeystore::GenerateKey(const std::string& name, 
                                       &software_enforced_characteristics);

}



bool BtifKeystore::DoesKeyExist() {

  return keystore_client_->doesKeyExist(kKeyStore);

}



}  // namespace bluetooth