Read the configuration before starting the native service.

Bug: 66739076
Bug: 65737446
Test: reboot-cycle.sh doesn't show a problem.
Change-Id: Ia0699cca7e07475d4df266b482a3b2c96519ed3b
This commit is contained in:
Paul Crowley 2017-09-27 10:56:54 -07:00
parent 12274eea5c
commit 3188805e35

View file

@ -97,13 +97,6 @@ int main(int argc, char** argv) {
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 @@ int main(int argc, char** argv) {
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";