tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adbd: when rebooting, don't close socket before pausing."

Browse source 
am: 9c16700e36

Change-Id: Id83a13aa4ad09de0cd9b6f63d0135b0c25132503
This commit is contained in:
Josh Gao 2018-08-02 16:13:36 -07:00 committed by android-build-merger
commit 2784b0a6bd
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
adb/daemon/services.cpp
View file

@ -94,7 +94,7 @@ void restart_usb_service(unique_fd fd) {
WriteFdExactly(fd.get(), "restarting in USB mode\n");
}
bool reboot_service_impl(unique_fd fd, const std::string& arg) {
void reboot_service(unique_fd fd, const std::string& arg) {
std::string reboot_arg = arg;
bool auto_reboot = false;
@ -108,7 +108,7 @@ bool reboot_service_impl(unique_fd fd, const std::string& arg) {
if (reboot_arg == "sideload") {
if (getuid() != 0) {
WriteFdExactly(fd.get(), "'adb root' is required for 'adb reboot sideload'.\n");
return false;
return;
}
const std::vector<std::string> options = {auto_reboot ? "--sideload_auto_reboot"
@ -116,7 +116,7 @@ bool reboot_service_impl(unique_fd fd, const std::string& arg) {
std::string err;
if (!write_bootloader_message(options, &err)) {
D("Failed to set bootloader message: %s", err.c_str());
return false;
return;
}
reboot_arg = "recovery";
@ -128,16 +128,9 @@ bool reboot_service_impl(unique_fd fd, const std::string& arg) {
std::string reboot_string = android::base::StringPrintf("reboot,%s", reboot_arg.c_str());
if (!android::base::SetProperty(ANDROID_RB_PROPERTY, reboot_string)) {
WriteFdFmt(fd.get(), "reboot (%s) failed\n", reboot_string.c_str());
return false;
}
return true;
}
void reboot_service(unique_fd fd, const std::string& arg) {
if (!reboot_service_impl(std::move(fd), arg)) {
return;
}
// Don't return early. Give the reboot command time to take effect
// to avoid messing up scripts which do "adb reboot && adb wait-for-device"
while (true) {