Commit: bd8c5865c9991dd318c7ac47263b527ad7a4cd9b - system-bt (git)

system/bt

Commit MetaInfo

• Révision: bd8c5865c9991dd318c7ac47263b527ad7a4cd9b (tree)
• l'heure: 2019-06-08 05:27:44
• Auteur: Martin Brabham <optedoblivion@goog...>
• Commiter: Martin Brabham

Message de Log

Confirm the presence of BT key when BT ON

After clearing Bluetooth data, the Bluetooth key will be cleared in the
same time. When turn on Bluetooth, NE happened at the step of checking
Bluetooth key.

Bug: 133214365
Test: ahost --host test net_test_bluetooth
Change-Id: I88f5dfae07352a794b304da60e09253c004fb3d4

Change Summary

• modified: btif/include/btif_keystore.h
• modified: btif/src/btif_config.cc
• modified: btif/src/btif_keystore.cc

Modification

--- a/btif/include/btif_keystore.h
+++ b/btif/include/btif_keystore.h
@@ -59,6 +59,14 @@ 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_;

--- a/btif/src/btif_config.cc
+++ b/btif/src/btif_config.cc
@@ -183,7 +183,9 @@ 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()) delete_config_files();
+  if (is_factory_reset() ||
+      (use_key_attestation() && !btif_keystore.DoesKeyExist()))
+    delete_config_files();
 
   std::string file_source;
 

--- a/btif/src/btif_keystore.cc
+++ b/btif/src/btif_keystore.cc
@@ -98,4 +98,8 @@ KeyStoreNativeReturnCode BtifKeystore::GenerateKey(const std::string& name,
                                        &software_enforced_characteristics);
 }
 
+bool BtifKeystore::DoesKeyExist() {
+  return keystore_client_->doesKeyExist(kKeyStore);
+}
+
 }  // namespace bluetooth