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 b4e3a370bf)

Change-Id: I37b7fd88d66ab49ef953d4b7dca22577bd1472e1

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) {}

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,

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);