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

Commit d2a4c1f8 authored by Bernie Innocenti's avatar Bernie Innocenti Committed by Automerger Merge Worker
Browse files

Merge "Add explicit Result::ok() checks where needed" am: bc053268 am: 0b0c5424

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66dafc280da0421afccadcd6c1c24e74dc306bf2
parents a7a0ea5a 0b0c5424
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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";
    }