tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "set zero shutdown timeout for eng build"

Browse source 
am: 6fb2ef1d03

Change-Id: Id9fbc2ad91d6e337be7e39ab747187427e69003f
This commit is contained in:
Keun-young Park 2017-03-29 21:29:37 +00:00 committed by android-build-merger
commit 5579d46471
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/Android.mk
View file

@ -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 += \

9
init/reboot.cpp
View file

@ -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"};