Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ae0a9ee authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "set zero shutdown timeout for eng build" am: 6fb2ef1d 

am: 5579d464

Change-Id: I10fe8d29054c15220a4a354eb3629353d307cc9d
parents 5b591daf 5579d464

init/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ init_options += \ 
    -DREBOOT_BOOTLOADER_ON_PANIC=0

endif



ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT)))

init_options += \

    -DSHUTDOWN_ZERO_TIMEOUT=1

else

init_options += \

    -DSHUTDOWN_ZERO_TIMEOUT=0

endif



init_options += -DLOG_UEVENTS=0



init_cflags += \

init/reboot.cpp

+8 −1
Original line number Diff line number Diff line
@@ -341,7 +341,14 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re 
    }



    /* TODO update default waiting time based on usage data */

    unsigned int shutdownTimeout = android::base::GetUintProperty("ro.build.shutdown_timeout", 10u);

    constexpr unsigned int shutdownTimeoutDefault = 10;

    unsigned int shutdownTimeout = shutdownTimeoutDefault;

    if (SHUTDOWN_ZERO_TIMEOUT) {  // eng build

        shutdownTimeout = 0;

    } else {

        shutdownTimeout =

            android::base::GetUintProperty("ro.build.shutdown_timeout", shutdownTimeoutDefault);

    }

    LOG(INFO) << "Shutdown timeout: " << shutdownTimeout;



    static const constexpr char* shutdown_critical_services[] = {"vold", "watchdogd"};