Switch logging to system log, persistable prop.
Use system log for more durable log history. Also accept persistable
version of flag to force adoptability.
Bug: 19993667
Change-Id: Icdf36799e26038e9a8e2bdaca276d97b22ba3941
diff --git a/main.cpp b/main.cpp
index 9bfe9d0..d159230 100644
--- a/main.cpp
+++ b/main.cpp
@@ -52,7 +52,7 @@
int main(int argc, char** argv) {
setenv("ANDROID_LOG_TAGS", "*:v", 1);
- android::base::InitLogging(argv);
+ android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM));
LOG(INFO) << "Vold 3.0 (the awakening) firing up";
@@ -228,7 +228,9 @@
flags |= android::vold::Disk::Flags::kDefaultPrimary;
}
- if (property_get_bool("vold.force_adoptable", false)) {
+ if (property_get_bool("vold.force_adoptable", false)
+ || property_get_bool("persist.vold.force_adoptable", false)) {
+ LOG(DEBUG) << "Forcing " << sysPattern << " to be adoptable";
flags |= android::vold::Disk::Flags::kAdoptable;
}