diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-10-19 21:15:06 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-19 21:15:06 +0200 |
commit | fd796317c309a9c2423d6de1b0c87d1004efbec4 (patch) | |
tree | 53388e66db91793598030067dea27790a7f2c0de /uncrypt/uncrypt.cpp | |
parent | Merge "Add a unit test for applypatch_check" (diff) | |
parent | Verify wipe package when wiping A/B device in recovery. (diff) | |
download | android_bootable_recovery-fd796317c309a9c2423d6de1b0c87d1004efbec4.tar android_bootable_recovery-fd796317c309a9c2423d6de1b0c87d1004efbec4.tar.gz android_bootable_recovery-fd796317c309a9c2423d6de1b0c87d1004efbec4.tar.bz2 android_bootable_recovery-fd796317c309a9c2423d6de1b0c87d1004efbec4.tar.lz android_bootable_recovery-fd796317c309a9c2423d6de1b0c87d1004efbec4.tar.xz android_bootable_recovery-fd796317c309a9c2423d6de1b0c87d1004efbec4.tar.zst android_bootable_recovery-fd796317c309a9c2423d6de1b0c87d1004efbec4.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 8b4d8ef8c..a5d692bbb 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -528,14 +528,31 @@ static bool setup_bcb(const int socket) { return false; } LOG(INFO) << " received command: [" << content << "] (" << 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)) { + PLOG(ERROR) << "failed to read " << path; + 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)) { LOG(ERROR) << "failed to set bootloader message: " << err; write_status_to_socket(-1, socket); return false; } + if (!wipe_package.empty() && !write_wipe_package(wipe_package, &err)) { + PLOG(ERROR) << "failed to set wipe package: " << err; + write_status_to_socket(-1, socket); + return false; + } // c10. send "100" status write_status_to_socket(100, socket); return true; |