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

Commit b5d418af authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Return the correct action for PromptAndWait" am: 99277fa6 am: c55e7fd9 

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888

Change-Id: Ie2d0b0dc1d5f6383fac4142cab4391816a419ab1
parents 435f3d3f c55e7fd9

recovery.cpp

+3 −3
Original line number Diff line number Diff line
@@ -421,15 +421,15 @@ static Device::BuiltinAction PromptAndWait(Device* device, InstallResult status) 
      case Device::REBOOT:

      case Device::SHUTDOWN:

        if (!ui->IsTextVisible()) {

          return Device::REBOOT;

          return chosen_action;

        }

        // okay to reboot; no need to ask.

        if (!update_in_progress) {

          return Device::REBOOT;

          return chosen_action;

        }

        // An update might have been failed. Ask if user really wants to reboot.

        if (AskToReboot(device, chosen_action)) {

          return Device::REBOOT;

          return chosen_action;

        }

        break;