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

Commit 0afc9869 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Reset persist.bluetooth.factoryreset after config files deleted" am:... 

Merge "Reset persist.bluetooth.factoryreset after config files deleted" am: 03c287c2 am: 5c1b3aef am: 8476be9f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2063243



Change-Id: I011c09899f09d0c5d2c9de668cb25d4c9a1e1d6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d798205c 8476be9f

system/gd/storage/storage_module.cc

+2 −0
Original line number Diff line number Diff line
@@ -156,8 +156,10 @@ void StorageModule::Start() { 
  std::lock_guard<std::recursive_mutex> lock(mutex_);

  std::string file_source;

  if (os::GetSystemProperty(kFactoryResetProperty) == "true") {

    LOG_INFO("%s is true, delete config files", kFactoryResetProperty.c_str());

    LegacyConfigFile::FromPath(config_file_path_).Delete();

    LegacyConfigFile::FromPath(config_backup_path_).Delete();

    os::SetSystemProperty(kFactoryResetProperty, "false");

  }

  if (!is_config_checksum_pass(kConfigFileComparePass)) {

    LegacyConfigFile::FromPath(config_file_path_).Delete();