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

Commit a077cb3d authored by Sal Savage's avatar Sal Savage Committed by Gerrit Code Review
Browse files

Merge "Don't use config object after std::move" into main

parents cfae36f8 39c4fa71

system/gd/storage/storage_module.cc

+2 −2
Original line number Diff line number Diff line
@@ -178,10 +178,10 @@ void StorageModule::Start() { 


  // Cleanup temporary pairings if we have left guest mode

  if (!com::android::bluetooth::flags::guest_mode_bond() && !is_restricted_mode_) {

    config->RemoveSectionWithProperty("Restricted");

    pimpl_->cache_.RemoveSectionWithProperty("Restricted");

  }



  config->FixDeviceTypeInconsistencies();

  pimpl_->cache_.FixDeviceTypeInconsistencies();

  if (bluetooth::os::ParameterProvider::GetBtKeystoreInterface() != nullptr) {

    bluetooth::os::ParameterProvider::GetBtKeystoreInterface()

            ->ConvertEncryptOrDecryptKeyIfNeeded();

system/gd/storage/storage_module_test.cc

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static const std::string kReadTestConfig = 
        "[01:02:03:ab:cd:ea]\n"

        "Name = hello world\n"

        "LinkKey = fedcba0987654321fedcba0987654328\n"

        "DevType = 1\n"

        "\n";



TEST_F(StorageModuleTest, read_existing_config_test) {