PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of ed4c49c to nyc-mr1-dev-plus-aosp

Browse Source 
Change-Id: I8788cc80473dc77bfa0cd2682f3acb6e17ac36df
This commit is contained in:
Yabin Cui
2016-06-21 11:00:44 -07:00
parent 23af9abbc8 ed4c49c199
commit bf049bffe2
8 changed files with 232 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
uncrypt/uncrypt.cpp
View File

@@ -501,14 +501,31 @@ static bool setup_bcb(const int socket) {
return false;
}
ALOGI(" received command: [%s] (%zu)", content.c_str(), content.size());
std::vector<std::string> options = android::base::Split(content, "\n");
std::string wipe_package;
for (auto& option : options) {
if (android::base::StartsWith(option, "--wipe_package=")) {
std::string path = option.substr(strlen("--wipe_package="));
if (!android::base::ReadFileToString(path, &wipe_package)) {
ALOGE("failed to read %s: %s", path.c_str(), strerror(errno));
return false;
}
option = android::base::StringPrintf("--wipe_package_size=%zu", wipe_package.size());
}
}
// c8. setup the bcb command
std::string err;
if (!write_bootloader_message({content}, &err)) {
if (!write_bootloader_message(options, &err)) {
ALOGE("failed to set bootloader message: %s", err.c_str());
write_status_to_socket(-1, socket);
return false;
}
if (!wipe_package.empty() && !write_wipe_package(wipe_package, &err)) {
ALOGE("failed to set wipe package: %s", err.c_str());
write_status_to_socket(-1, socket);
return false;
}
// c10. send "100" status
write_status_to_socket(100, socket);
return true;