ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't log userspace_reboot.started/finished properties from init

Browse source 
Instead they will be logged from system_server. This CL just prepares
grounds for logging CL to land.

Test: adb reboot userspace
Bug: 148767783
Change-Id: Ie9482ef735344ecfb0de8a37785d314a3c0417ff
This commit is contained in:
Nikita Ioffe 2020-02-06 23:33:42 +00:00
parent 62662cf189
commit 85ff4ab9a4
3 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
init/builtins.cpp
View file

@ -1309,17 +1309,6 @@ static Result<void> do_enter_default_mount_ns(const BuiltinArguments& args) {
}
}
static Result<void> do_finish_userspace_reboot(const BuiltinArguments&) {
LOG(INFO) << "Userspace reboot successfully finished";
boot_clock::time_point now = boot_clock::now();
SetProperty("sys.init.userspace_reboot.last_finished",
std::to_string(now.time_since_epoch().count()));
if (!android::sysprop::InitProperties::userspace_reboot_in_progress(false)) {
return Error() << "Failed to set sys.init.userspace_reboot.in_progress property";
}
return {};
}
// Builtin-function-map start
const BuiltinFunctionMap& GetBuiltinFunctionMap() {
constexpr std::size_t kMax = std::numeric_limits<std::size_t>::max();
@ -1341,7 +1330,6 @@ const BuiltinFunctionMap& GetBuiltinFunctionMap() {
{"exec_background", {1, kMax, {false, do_exec_background}}},
{"exec_start", {1, 1, {false, do_exec_start}}},
{"export", {2, 2, {false, do_export}}},
{"finish_userspace_reboot", {0, 0, {false, do_finish_userspace_reboot}}},
{"hostname", {1, 1, {true, do_hostname}}},
{"ifup", {1, 1, {true, do_ifup}}},
{"init_user0", {0, 0, {false, do_init_user0}}},

3
init/reboot.cpp
View file

@ -731,9 +731,6 @@ static Result<void> UnmountAllApexes() {
static Result<void> DoUserspaceReboot() {
LOG(INFO) << "Userspace reboot initiated";
boot_clock::time_point now = boot_clock::now();
SetProperty("sys.init.userspace_reboot.last_started",
std::to_string(now.time_since_epoch().count()));
auto guard = android::base::make_scope_guard([] {
// Leave shutdown so that we can handle a full reboot.
LeaveShutdown();

2
rootdir/init.rc
View file

@ -1058,4 +1058,4 @@ on userspace-reboot-resume
trigger boot
on property:sys.boot_completed=1 && property:sys.init.userspace_reboot.in_progress=1
finish_userspace_reboot
setprop sys.init.userspace_reboot.in_progress ""