commit e29807352afc739dbd1e1b8083fa15d359436374
author Tianjie Xu <xunchang@google.com> Thu Aug 24 22:51:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 24 22:51:44 2017 +0000
tree a5ea5b85bbfb96dfa8d2c1eeab79b9b34a3a1e1b
parent 7b795abd13ba11280920c6b39174d2b02b014970
parent 639fce1c4d8783dc7d144e49afc3169fd2645453

Merge "Add missing report of error code under recovery" am: 571855b0e6 am: 736be2f93e am: f134f0e5c0
am: 639fce1c4d

Change-Id: I089173b6b1a71d72c20d2564a8982c9a7f8c37c3

error_code.h

diff --git a/error_code.h b/error_code.h
index 4cbad4c..4e3032b 100644
--- a/error_code.h
+++ b/error_code.h
@@ -25,6 +25,9 @@
   kBootreasonInBlacklist,
   kPackageCompatibilityFailure,
   kScriptExecutionFailure,
+  kMapFileFailure,
+  kForkUpdateBinaryFailure,
+  kUpdateBinaryCommandFailure,
 };
 
 enum CauseCode {

install.cpp

diff --git a/install.cpp b/install.cpp
index 1220c6a..586dbbe 100644
--- a/install.cpp
+++ b/install.cpp
@@ -331,6 +331,7 @@
   if (ret) {
     close(pipefd[0]);
     close(pipefd[1]);
+    log_buffer->push_back(android::base::StringPrintf("error: %d", kUpdateBinaryCommandFailure));
     return ret;
   }
 
@@ -395,6 +396,7 @@
     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 @@
   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;
   }