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

Commit e97f0198 authored by Katherine Lai's avatar Katherine Lai Committed by Automerger Merge Worker
Browse files

Merge "floss: Don't assert when failing to SaveImmediately" into main am: 49905dab 

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



Change-Id: I79fee669ec1a4d0212f4a8601242ad4721ad6744
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eb1580e3 49905dab

system/gd/storage/storage_module.cc

+12 −0
Original line number Diff line number Diff line
@@ -123,10 +123,22 @@ void StorageModule::SaveImmediately() { 
  }

  // 1. rename old config to backup name

  if (os::FileExists(config_file_path_)) {

#ifndef TARGET_FLOSS

    ASSERT(os::RenameFile(config_file_path_, config_backup_path_));

#else

    if (!os::RenameFile(config_file_path_, config_backup_path_)) {

      LOG_ERROR("Unable to rename old config to back up name");

    }

#endif

  }

  // 2. write in-memory config to disk, if failed, backup can still be used

#ifndef TARGET_FLOSS

  ASSERT(LegacyConfigFile::FromPath(config_file_path_).Write(pimpl_->cache_));

#else

  if (!LegacyConfigFile::FromPath(config_file_path_).Write(pimpl_->cache_)) {

    LOG_ERROR("Unable to write config file to disk");

  }

#endif

  // 3. now write back up to disk as well

  if (!LegacyConfigFile::FromPath(config_backup_path_).Write(pimpl_->cache_)) {

    LOG_ERROR("Unable to write backup config file");