summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-09-14 00:28:32 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-09-14 00:28:32 +0200
commit1d55666106f80ae0824ac284f82d90899575358c (patch)
tree5594ed8d21addb3bb08d004bc6f1814f33bd765d
parentMerge "save uncrypt status to last_install" am: cdf509cce2 (diff)
parentMerge "Check corruption when reading uncrypt_status file" (diff)
downloadandroid_bootable_recovery-1d55666106f80ae0824ac284f82d90899575358c.tar
android_bootable_recovery-1d55666106f80ae0824ac284f82d90899575358c.tar.gz
android_bootable_recovery-1d55666106f80ae0824ac284f82d90899575358c.tar.bz2
android_bootable_recovery-1d55666106f80ae0824ac284f82d90899575358c.tar.lz
android_bootable_recovery-1d55666106f80ae0824ac284f82d90899575358c.tar.xz
android_bootable_recovery-1d55666106f80ae0824ac284f82d90899575358c.tar.zst
android_bootable_recovery-1d55666106f80ae0824ac284f82d90899575358c.zip
-rw-r--r--install.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/install.cpp b/install.cpp
index fac6151b3..4c697420f 100644
--- a/install.cpp
+++ b/install.cpp
@@ -392,6 +392,8 @@ install_package(const char* path, bool* wipe_cache, const char* install_file,
std::string 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_time:")) {
+ PLOG(WARNING) << "corrupted uncrypt_status: " << uncrypt_status;
} else {
fprintf(install_log, "%s\n", android::base::Trim(uncrypt_status).c_str());
}