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

Merge "adb: Fix the 'adb reboot sideload' for A/B devices."

Browse source
This commit is contained in:
Tao Bao 2017-01-06 16:59:38 +00:00 committed by Gerrit Code Review
commit 9f59a4663c
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
adb/Android.mk
View file

@ -330,6 +330,7 @@ LOCAL_STRIP_MODULE := keep_symbols
LOCAL_STATIC_LIBRARIES := \
libadbd \
libbase \
libbootloader_message \
libfs_mgr \
libfec \
libfec_rs \

18
adb/services.cpp
View file

@ -39,6 +39,7 @@
#if !ADB_HOST
#include <android-base/properties.h>
#include <bootloader_message/bootloader_message.h>
#include <cutils/android_reboot.h>
#include <private/android_logger.h>
#endif
@ -133,17 +134,12 @@ static bool reboot_service_impl(int fd, const char* arg) {
return false;
}
const char* const recovery_dir = "/cache/recovery";
const char* const command_file = "/cache/recovery/command";
// Ensure /cache/recovery exists.
if (adb_mkdir(recovery_dir, 0770) == -1 && errno != EEXIST) {
D("Failed to create directory '%s': %s", recovery_dir, strerror(errno));
return false;
}
bool write_status = android::base::WriteStringToFile(
auto_reboot ? "--sideload_auto_reboot" : "--sideload", command_file);
if (!write_status) {
const std::vector<std::string> options = {
auto_reboot ? "--sideload_auto_reboot" : "--sideload"
};
std::string err;
if (!write_bootloader_message(options, &err)) {
D("Failed to set bootloader message: %s", err.c_str());
return false;
}