diff options
author | Yabin Cui <yabinc@google.com> | 2016-06-21 19:10:49 +0200 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-21 19:10:49 +0200 |
commit | ed4c49c199224dfe2cf99a26864c5848487da2c3 (patch) | |
tree | 470a094131460851765cd88e9b576b7458348b5a /uncrypt/uncrypt.cpp | |
parent | Check the results from applypatch (diff) | |
parent | Verify wipe package when wiping A/B device in recovery. (diff) | |
download | android_bootable_recovery-ed4c49c199224dfe2cf99a26864c5848487da2c3.tar android_bootable_recovery-ed4c49c199224dfe2cf99a26864c5848487da2c3.tar.gz android_bootable_recovery-ed4c49c199224dfe2cf99a26864c5848487da2c3.tar.bz2 android_bootable_recovery-ed4c49c199224dfe2cf99a26864c5848487da2c3.tar.lz android_bootable_recovery-ed4c49c199224dfe2cf99a26864c5848487da2c3.tar.xz android_bootable_recovery-ed4c49c199224dfe2cf99a26864c5848487da2c3.tar.zst android_bootable_recovery-ed4c49c199224dfe2cf99a26864c5848487da2c3.zip |
Diffstat (limited to 'uncrypt/uncrypt.cpp')
-rw-r--r-- | uncrypt/uncrypt.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index d7105a01f..f62d13279 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -503,14 +503,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; |