diff options
author | Tianjie Xu <xunchang@google.com> | 2017-08-25 00:51:44 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-25 00:51:44 +0200 |
commit | e29807352afc739dbd1e1b8083fa15d359436374 (patch) | |
tree | a5ea5b85bbfb96dfa8d2c1eeab79b9b34a3a1e1b | |
parent | Import translations. DO NOT MERGE (diff) | |
parent | Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93e (diff) | |
download | android_bootable_recovery-e29807352afc739dbd1e1b8083fa15d359436374.tar android_bootable_recovery-e29807352afc739dbd1e1b8083fa15d359436374.tar.gz android_bootable_recovery-e29807352afc739dbd1e1b8083fa15d359436374.tar.bz2 android_bootable_recovery-e29807352afc739dbd1e1b8083fa15d359436374.tar.lz android_bootable_recovery-e29807352afc739dbd1e1b8083fa15d359436374.tar.xz android_bootable_recovery-e29807352afc739dbd1e1b8083fa15d359436374.tar.zst android_bootable_recovery-e29807352afc739dbd1e1b8083fa15d359436374.zip |
Diffstat (limited to '')
-rw-r--r-- | error_code.h | 3 | ||||
-rw-r--r-- | install.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/error_code.h b/error_code.h index 4cbad4cfe..4e3032bc9 100644 --- a/error_code.h +++ b/error_code.h @@ -25,6 +25,9 @@ enum ErrorCode { kBootreasonInBlacklist, kPackageCompatibilityFailure, kScriptExecutionFailure, + kMapFileFailure, + kForkUpdateBinaryFailure, + kUpdateBinaryCommandFailure, }; enum CauseCode { diff --git a/install.cpp b/install.cpp index 1220c6ab7..586dbbe2c 100644 --- a/install.cpp +++ b/install.cpp @@ -331,6 +331,7 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b if (ret) { close(pipefd[0]); close(pipefd[1]); + log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure)); return ret; } @@ -395,6 +396,7 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b close(pipefd[0]); close(pipefd[1]); PLOG(ERROR) << "Failed to fork update binary"; + log_buffer->push_back(android::base::StringPrintf("error: %d", kForkUpdateBinaryFailure)); return INSTALL_ERROR; } @@ -583,6 +585,7 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo MemMapping map; if (!map.MapFile(path)) { LOG(ERROR) << "failed to map file"; + log_buffer->push_back(android::base::StringPrintf("error: %d", kMapFileFailure)); return INSTALL_CORRUPT; } |