From 01daebbe68943725e7b80e30082330c6bd042a88 Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Thu, 8 Mar 2018 12:34:19 -0800 Subject: Set the update locations to default in CacheLocation's constructor Otherwise the applypatch executable will fail to back up the source file to /cache when patching the recovery image. Bug: 74198354 Test: run applypatch from boot to recovery (cherry picked from commit b4e3a370bf6fe2bbb6ad8e33d16ce3210595aaef) Change-Id: I37b7fd88d66ab49ef953d4b7dca22577bd1472e1 --- otautil/cache_location.cpp | 9 ++++----- otautil/include/otautil/cache_location.h | 5 +---- updater/updater.cpp | 4 ---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/otautil/cache_location.cpp b/otautil/cache_location.cpp index 8f289487f..8ddefec5e 100644 --- a/otautil/cache_location.cpp +++ b/otautil/cache_location.cpp @@ -25,8 +25,7 @@ CacheLocation& CacheLocation::location() { return cache_location; } -void CacheLocation::ResetLocations() { - cache_temp_source_ = kDefaultCacheTempSource; - last_command_file_ = kDefaultLastCommandFile; - stash_directory_base_ = kDefaultStashDirectoryBase; -} +CacheLocation::CacheLocation() + : cache_temp_source_(kDefaultCacheTempSource), + last_command_file_(kDefaultLastCommandFile), + stash_directory_base_(kDefaultStashDirectoryBase) {} diff --git a/otautil/include/otautil/cache_location.h b/otautil/include/otautil/cache_location.h index 85e0d485c..f2f663816 100644 --- a/otautil/include/otautil/cache_location.h +++ b/otautil/include/otautil/cache_location.h @@ -27,9 +27,6 @@ class CacheLocation { public: static CacheLocation& location(); - // Reset the locations to their default values. - void ResetLocations(); - // getter and setter functions. std::string cache_temp_source() const { return cache_temp_source_; @@ -53,7 +50,7 @@ class CacheLocation { } private: - CacheLocation() {} + CacheLocation(); DISALLOW_COPY_AND_ASSIGN(CacheLocation); // When there isn't enough room on the target filesystem to hold the patched version of the file, diff --git a/updater/updater.cpp b/updater/updater.cpp index f063e5fa1..1d6b172bb 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -169,10 +169,6 @@ int main(int argc, char** argv) { } ota_io_init(za, state.is_retry); - // Initialize the cache_temp_source, last_command_file and stash_directory_base to their default - // locations. - CacheLocation::location().ResetLocations(); - std::string result; bool status = Evaluate(&state, root, &result); -- cgit v1.2.3