From b656a154ea497c1a179079f082b0a0701453bec5 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Tue, 18 Apr 2017 23:54:29 -0700
Subject: Move sysMapFile and sysReleaseMap into MemMapping class.

Test: recovery_component_test
Test: recovery_unit_test
Test: Apply an OTA on angler.
Change-Id: I7170f03e4ce1fe06184ca1d7bcce0a695f33ac4d
---
 install.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'install.cpp')

diff --git a/install.cpp b/install.cpp
index d86f46caa..689f4a0c6 100644
--- a/install.cpp
+++ b/install.cpp
@@ -569,7 +569,7 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
   }
 
   MemMapping map;
-  if (sysMapFile(path.c_str(), &map) != 0) {
+  if (!map.MapFile(path)) {
     LOG(ERROR) << "failed to map file";
     return INSTALL_CORRUPT;
   }
@@ -577,7 +577,6 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
   // Verify package.
   if (!verify_package(map.addr, map.length)) {
     log_buffer->push_back(android::base::StringPrintf("error: %d", kZipVerificationFailure));
-    sysReleaseMap(&map);
     return INSTALL_CORRUPT;
   }
 
@@ -588,7 +587,6 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
     LOG(ERROR) << "Can't open " << path << " : " << ErrorCodeString(err);
     log_buffer->push_back(android::base::StringPrintf("error: %d", kZipOpenFailure));
 
-    sysReleaseMap(&map);
     CloseArchive(zip);
     return INSTALL_CORRUPT;
   }
@@ -596,7 +594,6 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
   // Additionally verify the compatibility of the package.
   if (!verify_package_compatibility(zip)) {
     log_buffer->push_back(android::base::StringPrintf("error: %d", kPackageCompatibilityFailure));
-    sysReleaseMap(&map);
     CloseArchive(zip);
     return INSTALL_CORRUPT;
   }
@@ -611,7 +608,6 @@ static int really_install_package(const std::string& path, bool* wipe_cache, boo
   ui->SetEnableReboot(true);
   ui->Print("\n");
 
-  sysReleaseMap(&map);
   CloseArchive(zip);
   return result;
 }
-- 
cgit v1.2.3