commit 3188805e357197e171b239565f06b95f6a3ca51c
author Paul Crowley <paulcrowley@google.com> Wed Sep 27 10:56:54 2017 -0700
committer Paul Crowley <paulcrowley@google.com> Wed Sep 27 10:56:54 2017 -0700
tree dcc1e934ea42c4daa849b348eb9ff617d0ce7588
parent 12274eea5ca6038fc22fb50aa4dfb286a0ef6d4e

Read the configuration before starting the native service.

Bug: 66739076
Bug: 65737446
Test: reboot-cycle.sh doesn't show a problem.
Change-Id: Ia0699cca7e07475d4df266b482a3b2c96519ed3b

main.cpp

diff --git a/main.cpp b/main.cpp
index 1bb7639..30f60a1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -97,13 +97,6 @@
         exit(1);
     }
 
-    ATRACE_BEGIN("VoldNativeService::start");
-    if (android::vold::VoldNativeService::start() != android::OK) {
-        LOG(ERROR) << "Unable to start VoldNativeService";
-        exit(1);
-    }
-    ATRACE_END();
-
     bool has_adoptable;
     bool has_quota;
 
@@ -111,6 +104,13 @@
         PLOG(ERROR) << "Error reading configuration... continuing anyways";
     }
 
+    ATRACE_BEGIN("VoldNativeService::start");
+    if (android::vold::VoldNativeService::start() != android::OK) {
+        LOG(ERROR) << "Unable to start VoldNativeService";
+        exit(1);
+    }
+    ATRACE_END();
+
     ATRACE_BEGIN("NetlinkManager::start");
     if (nm->start()) {
         PLOG(ERROR) << "Unable to start NetlinkManager";