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

Merge "Add explicit Result::ok() checks where needed" am: bc053268cf am: 0b0c5424a8 am: d2a4c1f841

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1229625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c670a3776c37b7d60e89469e13ec32c3172fee2
This commit is contained in:
Bernie Innocenti 2020-12-22 07:02:53 +00:00 • committed by Automerger Merge Worker
commit 5e5916375f
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/reboot.cpp
View file

@ -857,7 +857,7 @@ static Result<void> DoUserspaceReboot() {
sub_reason = "apex";
return result;
}
if (!SwitchToMountNamespaceIfNeeded(NS_BOOTSTRAP)) {
if (!SwitchToMountNamespaceIfNeeded(NS_BOOTSTRAP).ok()) {
sub_reason = "ns_switch";
return Error() << "Failed to switch to bootstrap namespace";
}