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

Commit 7ef53bc2 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Demote ASSERT => ERROR LegacyConfigFile::FromPath am: 8d9fab2d 

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



Change-Id: I9005dbb763c37186e00ce3ce743d7061495ec7dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d3b29d0 8d9fab2d

system/gd/storage/storage_module.cc

+3 −1
Original line number Diff line number Diff line
@@ -127,7 +127,9 @@ void StorageModule::SaveImmediately() { 
  // 2. write in-memory config to disk, if failed, backup can still be used

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

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

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

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

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

  }

  // 4. save checksum if it is running in common criteria mode

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

      bluetooth::os::ParameterProvider::IsCommonCriteriaMode()) {