aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu2017-08-24 17:10:25 -0500
committerGerrit Code Review2017-08-24 17:10:25 -0500
commit571855b0e6e8046f19f4c623df22db1b6a6cdaee (patch)
treef52302c856fff9d699748de2ec98bd76c17ba40d /install.cpp
parent3810046a553d8d0405dedd1c317d65e215557a8c (diff)
parent3fec8c64190b6600c01f383501f55f3b9350c213 (diff)
downloadplatform-bootable-recovery-571855b0e6e8046f19f4c623df22db1b6a6cdaee.tar.gz
platform-bootable-recovery-571855b0e6e8046f19f4c623df22db1b6a6cdaee.tar.xz
platform-bootable-recovery-571855b0e6e8046f19f4c623df22db1b6a6cdaee.zip
Merge "Add missing report of error code under recovery"
Diffstat (limited to 'install.cpp')
-rw-r--r--install.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/install.cpp b/install.cpp
index 1220c6ab..586dbbe2 100644
--- a/install.cpp
+++ b/install.cpp
@@ -331,6 +331,7 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b
331 if (ret) { 331 if (ret) {
332 close(pipefd[0]); 332 close(pipefd[0]);
333 close(pipefd[1]); 333 close(pipefd[1]);
334 log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure));
334 return ret; 335 return ret;
335 } 336 }
336 337
@@ -395,6 +396,7 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b
395 close(pipefd[0]); 396 close(pipefd[0]);
396 close(pipefd[1]); 397 close(pipefd[1]);
397 PLOG(ERROR) << "Failed to fork update binary"; 398 PLOG(ERROR) << "Failed to fork update binary";
399 log_buffer->push_back(android::base::StringPrintf("error: %d", kForkUpdateBinaryFailure));
398 return INSTALL_ERROR; 400 return INSTALL_ERROR;
399 } 401 }
400 402
@@ -583,6 +585,7 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
583 MemMapping map; 585 MemMapping map;
584 if (!map.MapFile(path)) { 586 if (!map.MapFile(path)) {
585 LOG(ERROR) << "failed to map file"; 587 LOG(ERROR) << "failed to map file";
588 log_buffer->push_back(android::base::StringPrintf("error: %d", kMapFileFailure));
586 return INSTALL_CORRUPT; 589 return INSTALL_CORRUPT;
587 } 590 }
588 591