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

Commit 50dd5329 authored by Tao Bao's avatar Tao Bao
Browse files

recovery: Fix the FIXME in get_menu_selection(). 

It used to return a REBOOT action on timeout, until the CL in commit
daefc1d4 that redefined the return value
of get_menu_selection() (changing from action to a menu index).

Prior to this CL, it was returning 0 (i.e. the value of Device::REBOOT)
to trigger the reboot. This CL specifies a return value of -1 to
indicate the timeout.

Test: Boot into a user build recovery; it reboots automatically on
      timeout (120 sec).
Change-Id: I4aedb7a4628bf258017078fe73eb8b48a21d0ea8
parent fc5499f2

recovery.cpp

+94 −99
Original line number Diff line number Diff line
@@ -609,26 +609,26 @@ static bool erase_volume(const char* volume) { 


// Display a menu with the specified 'headers' and 'items'. Device specific HandleMenuKey() may

// return a positive number beyond the given range. Caller sets 'menu_only' to true to ensure only

// a menu item gets selected. 'initial_selection' controls the initial cursor location.

// a menu item gets selected. 'initial_selection' controls the initial cursor location. Returns the

// (non-negative) chosen item number, or -1 if timed out waiting for input.

static int get_menu_selection(const char* const* headers, const char* const* items, bool menu_only,

                              int initial_selection, Device* device) {

  // Throw away keys pressed previously, so user doesn't accidentally trigger menu items.

  ui->FlushKeys();



  ui->StartMenu(headers, items, initial_selection);



  int selected = initial_selection;

  int chosen_item = -1;



  while (chosen_item < 0) {

    int key = ui->WaitKey();



    if (key == -1) {  // ui_wait_key() timed out

    if (key == -1) {  // WaitKey() timed out.

      if (ui->WasTextEverVisible()) {

        continue;

      } else {

        LOG(INFO) << "timed out waiting for key input; rebooting.";

        LOG(INFO) << "Timed out waiting for key input; rebooting.";

        ui->EndMenu();

        return 0;  // XXX fixme

        return -1;

      }

    }
@@ -1091,11 +1091,9 @@ static int apply_from_sdcard(Device* device, bool* wipe_cache) { 
    return result;

}



// Return REBOOT, SHUTDOWN, or REBOOT_BOOTLOADER.  Returning NO_ACTION

// means to take the default, which is to reboot or shutdown depending

// on if the --shutdown_after flag was passed to recovery.

static Device::BuiltinAction

prompt_and_wait(Device* device, int status) {

// Returns REBOOT, SHUTDOWN, or REBOOT_BOOTLOADER. Returning NO_ACTION means to take the default,

// which is to reboot or shutdown depending on if the --shutdown_after flag was passed to recovery.

static Device::BuiltinAction prompt_and_wait(Device* device, int status) {

  for (;;) {

    finish_recovery();

    switch (status) {
@@ -1113,10 +1111,10 @@ prompt_and_wait(Device* device, int status) { 


    int chosen_item = get_menu_selection(nullptr, device->GetMenuItems(), false, 0, device);



        // device-specific code may take some action here.  It may

        // return one of the core actions handled in the switch

        // statement below.

        Device::BuiltinAction chosen_action = device->InvokeMenuItem(chosen_item);

    // Device-specific code may take some action here. It may return one of the core actions

    // handled in the switch statement below.

    Device::BuiltinAction chosen_action =

        (chosen_item == -1) ? Device::REBOOT : device->InvokeMenuItem(chosen_item);



    bool should_wipe_cache = false;

    switch (chosen_action) {
@@ -1181,11 +1179,9 @@ prompt_and_wait(Device* device, int status) { 
        break;



      case Device::MOUNT_SYSTEM:

                // For a system image built with the root directory (i.e.

                // system_root_image == "true"), we mount it to /system_root, and symlink /system

                // to /system_root/system to make adb shell work (the symlink is created through

                // the build system).

                // Bug: 22855115

        // For a system image built with the root directory (i.e. system_root_image == "true"), we

        // mount it to /system_root, and symlink /system to /system_root/system to make adb shell

        // work (the symlink is created through the build system). (Bug: 22855115)

        if (android::base::GetBoolProperty("ro.build.system_root_image", false)) {

          if (ensure_path_mounted_at("/", "/system_root") != -1) {

            ui->Print("Mounted /system.\n");
@@ -1195,7 +1191,6 @@ prompt_and_wait(Device* device, int status) { 
            ui->Print("Mounted /system.\n");

          }

        }



        break;

    }

  }