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

Commit 5a6cde8b authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8673593, 8673409, 8673796, 8673797, 8673798, 8673855,... 

Merge cherrypicks of [8673593, 8673409, 8673796, 8673797, 8673798, 8673855, 8673151, 8673594, 8673499, 8673799, 8673895, 8673896] into qt-release

Change-Id: I7e089c85c21dbbad3bb7a4b56dfe2edcf2c1c54d
parents 2155f275 793e8943

install/adb_install.cpp

+3 −1
Original line number Diff line number Diff line
@@ -363,11 +363,13 @@ int ApplyFromAdb(Device* device, bool rescue_mode, Device::BuiltinAction* reboot 
        "\n\nNow send the package you want to apply\n"

        "to the device with \"adb sideload <filename>\"...\n");

  } else {

    ui->Print("\n\nWaiting for rescue commands...\n");

    command_map.emplace(MinadbdCommand::kWipeData, [&device]() {

      bool result = WipeData(device, false);

      return std::make_pair(result, true);

    });

    command_map.emplace(MinadbdCommand::kNoOp, []() { return std::make_pair(true, true); });



    ui->Print("\n\nWaiting for rescue commands...\n");

  }



  CreateMinadbdServiceAndExecuteCommands(ui, command_map, rescue_mode);

minadbd/minadbd_services.cpp

+8 −0
Original line number Diff line number Diff line
@@ -173,6 +173,14 @@ static void RescueGetpropHostService(unique_fd sfd, const std::string& prop) { 
  if (!android::base::WriteFully(sfd, result.data(), result.size())) {

    exit(kMinadbdHostSocketIOError);

  }



  // Send heartbeat signal to keep the rescue service alive.

  if (!WriteCommandToFd(MinadbdCommand::kNoOp, minadbd_socket)) {

    exit(kMinadbdSocketIOError);

  }

  if (MinadbdCommandStatus status; !WaitForCommandStatus(minadbd_socket, &status)) {

    exit(kMinadbdMessageFormatError);

  }

}



// Reboots into the given target. We don't reboot directly from minadbd, but going through recovery

minadbd/minadbd_types.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ enum class MinadbdCommand : uint32_t { 
  kRebootRescue = 6,

  kWipeCache = 7,

  kWipeData = 8,

  kNoOp = 9,



  // Last but invalid command.

  kError,