From a8c0d0b43a2f46afeada2bf0960232b4b0890b07 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 26 Sep 2016 11:39:14 -0700 Subject: DO NOT MERGE Duplicate the last_install content into last_log. Currently we save the OTA metrics in last_install, which keeps the data for the _last_ install only. This CL logs the same content into last_log so that we keep the metrics for every install. Bug: 31607469 Test: Apply an update (via OTA and sideload) and check last_log and last_install. Change-Id: Id8f174d79534fddc9f06d72a4e69b2b1d8ab186c (cherry picked from commit f4885adc189f246ac3c651aa5cb2e74a240f3f1e) --- recovery.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'recovery.cpp') diff --git a/recovery.cpp b/recovery.cpp index ccb2d223b..0f0b978e7 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1429,15 +1429,18 @@ static bool bootreason_in_blacklist() { } static void log_failure_code(ErrorCode code, const char *update_package) { - FILE* install_log = fopen_path(TEMPORARY_INSTALL_FILE, "w"); - if (install_log != nullptr) { - fprintf(install_log, "%s\n", update_package); - fprintf(install_log, "0\n"); - fprintf(install_log, "error: %d\n", code); - fclose(install_log); - } else { - LOGE("failed to open last_install: %s\n", strerror(errno)); + std::vector log_buffer = { + update_package, + "0", // install result + "error: " + std::to_string(code), + }; + std::string log_content = android::base::Join(log_buffer, "\n"); + if (!android::base::WriteStringToFile(log_content, TEMPORARY_INSTALL_FILE)) { + LOGE("failed to write %s: %s\n", TEMPORARY_INSTALL_FILE, strerror(errno)); } + + // Also write the info into last_log. + LOGI("%s\n", log_content.c_str()); } static ssize_t logbasename( -- cgit v1.2.3