PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Minor clean up to install.cpp."

Browse Source 
am: 08146728c1

Change-Id: Ie1f04ce992d48f37fae1fc8c8f083b21634e1024
This commit is contained in:
Tao Bao
2017-04-19 18:05:18 +00:00
committed by android-build-merger
parent 1fc109bdc7 08146728c1
commit 668e84233d
1 changed files with 60 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
install.cpp
View File

@@ -48,7 +48,6 @@
#include "common.h" #include "common.h"
#include "error_code.h" #include "error_code.h"
#include "minui/minui.h"
#include "otautil/SysUtil.h" #include "otautil/SysUtil.h"
#include "otautil/ThermalUtil.h" #include "otautil/ThermalUtil.h"
#include "roots.h" #include "roots.h"
@@ -57,15 +56,11 @@
using namespace std::chrono_literals; using namespace std::chrono_literals;
#define PUBLIC_KEYS_FILE "/res/keys"
static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata"; static constexpr const char* METADATA_PATH = "META-INF/com/android/metadata";
static constexpr const char* UNCRYPT_STATUS = "/cache/recovery/uncrypt_status";
// Default allocation of progress bar segments to operations // Default allocation of progress bar segments to operations
static constexpr int VERIFICATION_PROGRESS_TIME = 60; static constexpr int VERIFICATION_PROGRESS_TIME = 60;
static constexpr float VERIFICATION_PROGRESS_FRACTION = 0.25; static constexpr float VERIFICATION_PROGRESS_FRACTION = 0.25;
static constexpr float DEFAULT_FILES_PROGRESS_FRACTION = 0.4;
static constexpr float DEFAULT_IMAGE_PROGRESS_FRACTION = 0.1;
static std::condition_variable finish_log_temperature; static std::condition_variable finish_log_temperature;
@@ -621,80 +616,80 @@ really_install_package(const char *path, bool* wipe_cache, bool needs_mount,
return result; return result;
} }
int int install_package(const char* path, bool* wipe_cache, const char* install_file, bool needs_mount,
install_package(const char* path, bool* wipe_cache, const char* install_file, int retry_count) {
bool needs_mount, int retry_count) modified_flash = true;
{ auto start = std::chrono::system_clock::now();
modified_flash = true;
auto start = std::chrono::system_clock::now();
int start_temperature = GetMaxValueFromThermalZone(); int start_temperature = GetMaxValueFromThermalZone();
int max_temperature = start_temperature; int max_temperature = start_temperature;
int result; int result;
std::vector<std::string> log_buffer; std::vector<std::string> log_buffer;
if (setup_install_mounts() != 0) { if (setup_install_mounts() != 0) {
LOG(ERROR) << "failed to set up expected mounts for install; aborting"; LOG(ERROR) << "failed to set up expected mounts for install; aborting";
result = INSTALL_ERROR; result = INSTALL_ERROR;
} else {
result = really_install_package(path, wipe_cache, needs_mount, log_buffer, retry_count,
&max_temperature);
}
// Measure the time spent to apply OTA update in seconds.
std::chrono::duration<double> duration = std::chrono::system_clock::now() - start;
int time_total = static_cast<int>(duration.count());
bool has_cache = volume_for_path("/cache") != nullptr;
// Skip logging the uncrypt_status on devices without /cache.
if (has_cache) {
static constexpr const char* UNCRYPT_STATUS = "/cache/recovery/uncrypt_status";
if (ensure_path_mounted(UNCRYPT_STATUS) != 0) {
LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS;
} else { } else {
result = really_install_package(path, wipe_cache, needs_mount, log_buffer, retry_count, std::string uncrypt_status;
&max_temperature); if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
} PLOG(WARNING) << "failed to read uncrypt status";
} else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
// Measure the time spent to apply OTA update in seconds. LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
std::chrono::duration<double> duration = std::chrono::system_clock::now() - start;
int time_total = static_cast<int>(duration.count());
bool has_cache = volume_for_path("/cache") != nullptr;
// Skip logging the uncrypt_status on devices without /cache.
if (has_cache) {
if (ensure_path_mounted(UNCRYPT_STATUS) != 0) {
LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS;
} else { } else {
std::string uncrypt_status; log_buffer.push_back(android::base::Trim(uncrypt_status));
if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) {
PLOG(WARNING) << "failed to read uncrypt status";
} else if (!android::base::StartsWith(uncrypt_status, "uncrypt_")) {
LOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
} else {
log_buffer.push_back(android::base::Trim(uncrypt_status));
}
} }
} }
}
// The first two lines need to be the package name and install result. // The first two lines need to be the package name and install result.
std::vector<std::string> log_header = { std::vector<std::string> log_header = {
path, path,
result == INSTALL_SUCCESS ? "1" : "0", result == INSTALL_SUCCESS ? "1" : "0",
"time_total: " + std::to_string(time_total), "time_total: " + std::to_string(time_total),
"retry: " + std::to_string(retry_count), "retry: " + std::to_string(retry_count),
}; };
int end_temperature = GetMaxValueFromThermalZone(); int end_temperature = GetMaxValueFromThermalZone();
max_temperature = std::max(end_temperature, max_temperature); max_temperature = std::max(end_temperature, max_temperature);
if (start_temperature > 0) { if (start_temperature > 0) {
log_buffer.push_back("temperature_start: " + std::to_string(start_temperature)); log_buffer.push_back("temperature_start: " + std::to_string(start_temperature));
} }
if (end_temperature > 0) { if (end_temperature > 0) {
log_buffer.push_back("temperature_end: " + std::to_string(end_temperature)); log_buffer.push_back("temperature_end: " + std::to_string(end_temperature));
} }
if (max_temperature > 0) { if (max_temperature > 0) {
log_buffer.push_back("temperature_max: " + std::to_string(max_temperature)); log_buffer.push_back("temperature_max: " + std::to_string(max_temperature));
} }
std::string log_content = android::base::Join(log_header, "\n") + "\n" + std::string log_content =
android::base::Join(log_buffer, "\n") + "\n"; android::base::Join(log_header, "\n") + "\n" + android::base::Join(log_buffer, "\n") + "\n";
if (!android::base::WriteStringToFile(log_content, install_file)) { if (!android::base::WriteStringToFile(log_content, install_file)) {
PLOG(ERROR) << "failed to write " << install_file; PLOG(ERROR) << "failed to write " << install_file;
} }
// Write a copy into last_log. // Write a copy into last_log.
LOG(INFO) << log_content; LOG(INFO) << log_content;
return result; return result;
} }
bool verify_package(const unsigned char* package_data, size_t package_size) { bool verify_package(const unsigned char* package_data, size_t package_size) {
static constexpr const char* PUBLIC_KEYS_FILE = "/res/keys";
std::vector<Certificate> loadedKeys; std::vector<Certificate> loadedKeys;
if (!load_keys(PUBLIC_KEYS_FILE, loadedKeys)) { if (!load_keys(PUBLIC_KEYS_FILE, loadedKeys)) {
LOG(ERROR) << "Failed to load keys"; LOG(ERROR) << "Failed to load keys";