aboutsummaryrefslogtreecommitdiff
path: root/host/commands/modem_simulator/nvram_config.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'host/commands/modem_simulator/nvram_config.cpp')
-rw-r--r--host/commands/modem_simulator/nvram_config.cpp6
1 files 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();
}
}
}