diff options
Diffstat (limited to 'install.cpp')
-rw-r--r-- | install.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/install.cpp b/install.cpp index d86f46caa..2cc06603b 100644 --- a/install.cpp +++ b/install.cpp @@ -287,7 +287,7 @@ int update_binary_command(const std::string& path, ZipArchiveHandle zip, int ret *cmd = { binary, - EXPAND(RECOVERY_API_VERSION), // defined in Android.mk + std::to_string(kRecoveryApiVersion), std::to_string(status_fd), path, }; @@ -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; } |