commit 33d180914ef2cb9286595fb1fdcc3511c5fb1c34
author Kelvin Zhang <zhangkelvin@google.com> Mon Jun 29 16:33:10 2020 -0400
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 30 02:00:06 2020 +0000
tree ab5005b5b5b2ac0f4d856b7cb9bbf82f46be4cf5
parent 70eef23d3a4fa570220d3f18592a2711b5fc1f68

Fall back to memory pref if pref dir doesn't exist

Test: Run existing unit tests
Bug: 153004173
Change-Id: Iba5c2d3e7988e78050f05ad00dddf2ebdc03fa22

daemon_state_android.cc

diff --git a/daemon_state_android.cc b/daemon_state_android.cc
index c9c09b8..3376e64 100644
--- a/daemon_state_android.cc
+++ b/daemon_state_android.cc
@@ -45,17 +45,17 @@
 
   // Initialize prefs.
   base::FilePath non_volatile_path;
-  // TODO(deymo): Fall back to in-memory prefs if there's no physical directory
-  // available.
   if (!hardware_->GetNonVolatileDirectory(&non_volatile_path)) {
-    LOG(ERROR) << "Failed to get a non-volatile directory.";
-    return false;
-  }
-  Prefs* prefs = new Prefs();
-  prefs_.reset(prefs);
-  if (!prefs->Init(non_volatile_path.Append(kPrefsSubDirectory))) {
-    LOG(ERROR) << "Failed to initialize preferences.";
-    return false;
+    prefs_.reset(new MemoryPrefs());
+    LOG(WARNING)
+        << "Could not get a non-volatile directory, fall back to memory prefs";
+  } else {
+    Prefs* prefs = new Prefs();
+    prefs_.reset(prefs);
+    if (!prefs->Init(non_volatile_path.Append(kPrefsSubDirectory))) {
+      LOG(ERROR) << "Failed to initialize preferences.";
+      return false;
+    }
   }
 
   // The CertificateChecker singleton is used by the update attempter.