From 900aa70cc617eedd5a9c39b169c2871e3e99da51 Mon Sep 17 00:00:00 2001
From: Weilun Du <wdu@google.com>
Date: Wed, 24 Jan 2024 21:47:58 -0800
Subject: Fall back to default nvram config if LoadFromFile fails in modem
 simulator.

Bug: 315167296
Test: TreeHugger
(cherry picked from https://android-review.googlesource.com/q/commit:6d4dca40f94b33d5b3f6aaadf73d70a323394a97)
Merged-In: I2f94b50e39686392ce3b295bc950af9c4a7686e4
Change-Id: I2f94b50e39686392ce3b295bc950af9c4a7686e4
---
 host/commands/modem_simulator/nvram_config.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/host/commands/modem_simulator/nvram_config.cpp b/host/commands/modem_simulator/nvram_config.cpp
index ad06f9427..22b337329 100644
--- a/host/commands/modem_simulator/nvram_config.cpp
+++ b/host/commands/modem_simulator/nvram_config.cpp
@@ -56,8 +56,10 @@ NvramConfig* NvramConfig::BuildConfigImpl(size_t num_instances, int sim_type) {
     } else {
       auto loaded = ret->LoadFromFile(nvram_config_path.c_str());
       if (!loaded) {
-        delete ret;
-        return nullptr;
+        /** Bug: (b/315167296)
+         * Fall back to default nvram config if LoadFromFile fails.
+         */
+        ret->InitDefaultNvramConfig();
       }
     }
   }
-- 
cgit v1.2.3