commit f134f0e5c0d168d77257074f57b67c98c8a02be8
author Tianjie Xu <xunchang@google.com> Thu Aug 24 22:28:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 24 22:28:10 2017 +0000
tree 2da1b6952d20a01a3cf5d4b4ced1faeda202576a
parent 7379a5290dd96e9382232c1be625e5a3431f05b0
parent 736be2f93e7739b1e07d6466f9f37e8c391824ad

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

Change-Id: Ia2be72d6efac6be06178640c3b6ab716e99c6edf

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;
   }