summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2016-09-01 20:51:17 +0200
committerTianjie Xu <xunchang@google.com>2016-09-02 00:00:17 +0200
commit073451ae2173e51f5a803287de677dc7c6a68e4f (patch)
tree1d49bf9dc21e3f6109867524881a182f92f1df80
parentSwitch recovery to libbase logging (diff)
downloadandroid_bootable_recovery-073451ae2173e51f5a803287de677dc7c6a68e4f.tar
android_bootable_recovery-073451ae2173e51f5a803287de677dc7c6a68e4f.tar.gz
android_bootable_recovery-073451ae2173e51f5a803287de677dc7c6a68e4f.tar.bz2
android_bootable_recovery-073451ae2173e51f5a803287de677dc7c6a68e4f.tar.lz
android_bootable_recovery-073451ae2173e51f5a803287de677dc7c6a68e4f.tar.xz
android_bootable_recovery-073451ae2173e51f5a803287de677dc7c6a68e4f.tar.zst
android_bootable_recovery-073451ae2173e51f5a803287de677dc7c6a68e4f.zip
-rw-r--r--install.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/install.cpp b/install.cpp
index 4afa15c1d..4a856cd71 100644
--- a/install.cpp
+++ b/install.cpp
@@ -184,19 +184,19 @@ static int check_newer_ab_build(ZipArchive* zip)
}
// Check for downgrade version.
- int64_t build_timestampt = property_get_int64(
+ int64_t build_timestamp = property_get_int64(
"ro.build.date.utc", std::numeric_limits<int64_t>::max());
- int64_t pkg_post_timespampt = 0;
+ int64_t pkg_post_timestamp = 0;
// We allow to full update to the same version we are running, in case there
// is a problem with the current copy of that version.
if (metadata["post-timestamp"].empty() ||
!android::base::ParseInt(metadata["post-timestamp"].c_str(),
- &pkg_post_timespampt) ||
- pkg_post_timespampt < build_timestampt) {
+ &pkg_post_timestamp) ||
+ pkg_post_timestamp < build_timestamp) {
if (metadata["ota-downgrade"] != "yes") {
LOG(ERROR) << "Update package is older than the current build, expected a build "
- "newer than timestamp " << build_timestampt << " but package has "
- "timestamp " << pkg_post_timespampt << " and downgrade not allowed.";
+ "newer than timestamp " << build_timestamp << " but package has "
+ "timestamp " << pkg_post_timestamp << " and downgrade not allowed.";
return INSTALL_ERROR;
}
if (pkg_pre_build_fingerprint.empty()) {