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

Commit 0cd8986b authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "Reboot the device on user build after the install fails" am: d6f43684 

am: 4849c870

Change-Id: I7fd09a998e2a3d21ad9c772179890988b44809b5
parents 33a8900d 4849c870

recovery.cpp

+12 −4
Original line number Diff line number Diff line
@@ -1593,14 +1593,22 @@ int main(int argc, char **argv) { 
        }

    }



    if (!sideload_auto_reboot && (status == INSTALL_ERROR || status == INSTALL_CORRUPT)) {

        copy_logs();

    if (status == INSTALL_ERROR || status == INSTALL_CORRUPT) {

        ui->SetBackground(RecoveryUI::ERROR);

        if (!ui->IsTextVisible()) {

            sleep(5);

        }

    }



    Device::BuiltinAction after = shutdown_after ? Device::SHUTDOWN : Device::REBOOT;

    if ((status != INSTALL_SUCCESS && status != INSTALL_SKIPPED && !sideload_auto_reboot) ||

            ui->IsTextVisible()) {

    // 1. If the recovery menu is visible, prompt and wait for commands.

    // 2. If the state is INSTALL_NONE, wait for commands. (i.e. In user build, manually reboot into

    //    recovery to sideload a package.)

    // 3. sideload_auto_reboot is an option only available in user-debug build, reboot the device

    //    without waiting.

    // 4. In all other cases, reboot the device. Therefore, normal users will observe the device

    //    reboot after it shows the "error" screen for 5s.

    if ((status == INSTALL_NONE && !sideload_auto_reboot) || ui->IsTextVisible()) {

        Device::BuiltinAction temp = prompt_and_wait(device, status);

        if (temp != Device::NO_ACTION) {

            after = temp;