diff options
author | Jeff Sharkey <jsharkey@android.com> | 2015-04-18 16:15:10 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2015-04-18 16:15:12 -0700 |
commit | 5bad3780159761c3899c134ee4a56766ae685a6e (patch) | |
tree | 3e2ec40f04303e42e91de2a9ff8decf121f19d2d /main.cpp | |
parent | f1b996df6f8283aac6953b22bd9e2496d8c30c86 (diff) | |
download | android_system_vold-5bad3780159761c3899c134ee4a56766ae685a6e.tar.gz android_system_vold-5bad3780159761c3899c134ee4a56766ae685a6e.tar.bz2 android_system_vold-5bad3780159761c3899c134ee4a56766ae685a6e.zip |
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
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -52,7 +52,7 @@ using android::base::StringPrintf; 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 @@ static int process_config(VolumeManager *vm) { 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; } |