diff options
author | Tianjie Xu <xunchang@google.com> | 2016-09-13 03:48:10 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-13 03:48:10 +0200 |
commit | 4769f209dcccdcfec7f419f277f874ec17293a50 (patch) | |
tree | a931b211f9f19c8ac78c6f63110ed862a12b0930 /install.cpp | |
parent | Remove duplicate thread loop (diff) | |
parent | save uncrypt status to last_install (diff) | |
download | android_bootable_recovery-4769f209dcccdcfec7f419f277f874ec17293a50.tar android_bootable_recovery-4769f209dcccdcfec7f419f277f874ec17293a50.tar.gz android_bootable_recovery-4769f209dcccdcfec7f419f277f874ec17293a50.tar.bz2 android_bootable_recovery-4769f209dcccdcfec7f419f277f874ec17293a50.tar.lz android_bootable_recovery-4769f209dcccdcfec7f419f277f874ec17293a50.tar.xz android_bootable_recovery-4769f209dcccdcfec7f419f277f874ec17293a50.tar.zst android_bootable_recovery-4769f209dcccdcfec7f419f277f874ec17293a50.zip |
Diffstat (limited to 'install.cpp')
-rw-r--r-- | install.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/install.cpp b/install.cpp index 02c845cb8..9227d5895 100644 --- a/install.cpp +++ b/install.cpp @@ -30,6 +30,8 @@ #include <string> #include <vector> +#include <android-base/file.h> +#include <android-base/logging.h> #include <android-base/parseint.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> @@ -54,6 +56,7 @@ static constexpr const char* AB_OTA_PAYLOAD_PROPERTIES = "payload_properties.txt static constexpr const char* AB_OTA_PAYLOAD = "payload.bin"; #define PUBLIC_KEYS_FILE "/res/keys" 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 static const int VERIFICATION_PROGRESS_TIME = 60; @@ -539,6 +542,16 @@ install_package(const char* path, bool* wipe_cache, const char* install_file, fprintf(install_log, "%s\n", s.c_str()); } + if (ensure_path_mounted(UNCRYPT_STATUS) != 0) { + LOG(WARNING) << "Can't mount " << UNCRYPT_STATUS; + } else { + std::string uncrypt_status; + if (!android::base::ReadFileToString(UNCRYPT_STATUS, &uncrypt_status)) { + PLOG(WARNING) << "failed to read uncrypt status"; + } else { + fprintf(install_log, "%s\n", android::base::Trim(uncrypt_status).c_str()); + } + } fclose(install_log); } return result; |