commit ba8c7e75a9138cca33deb148fcbc4d02dca405a5
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 17 20:56:17 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 17 20:56:17 2017 +0000
tree 3c5ff8548abaf5ec046d7f73f4242eb244aee72e
parent 8d989c76b0fd246526de1228ab03a2d57104ed2e
parent 8a845814f8ec6645d28d485c6bc8b5bbc87fb0c7

Merge "dlext_namespace.h: Declare android_get_LD_LIBRARY_PATH" into nyc-mr2-dev-plus-aosp

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 7f17a0c..ee5add8 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -409,7 +409,7 @@
         const char *default_value;
     } prop_map[] = {
         { "ro.boot.serialno",   "ro.serialno",   "", },
-        { "ro.boot.mode",       "ro.bootmode",   "normal", },
+        { "ro.boot.mode",       "ro.bootmode",   "unknown", },
         { "ro.boot.baseband",   "ro.baseband",   "unknown", },
         { "ro.boot.bootloader", "ro.bootloader", "unknown", },
         { "ro.boot.hardware",   "ro.hardware",   "unknown", },
@@ -800,13 +800,7 @@
     parser.AddSectionParser("service",std::make_unique<ServiceParser>());
     parser.AddSectionParser("on", std::make_unique<ActionParser>());
     parser.AddSectionParser("import", std::make_unique<ImportParser>());
-
-    std::string bootscript = property_get("ro.boot.init_rc");
-    if (bootscript.empty()) {
-        parser.ParseConfig("/init.rc");
-    } else {
-        parser.ParseConfig(bootscript);
-    }
+    parser.ParseConfig("/init.rc");
 
     ActionManager& am = ActionManager::GetInstance();
 
@@ -831,8 +825,7 @@
     std::string bootmode = property_get("ro.bootmode");
     if (bootmode == "charger") {
         am.QueueEventTrigger("charger");
-    } else if (bootmode == "normal") {
-        // only trigger late-init in normal boot
+    } else {
         am.QueueEventTrigger("late-init");
     }