diff options
| author | Nikita Ioffe <ioffe@google.com> | 2020-09-24 15:51:26 +0100 |
|---|---|---|
| committer | Nikita Ioffe <ioffe@google.com> | 2020-09-24 15:51:26 +0100 |
| commit | a5f9c449e47515ac3ae1dedece4559014fdf0ab7 (patch) | |
| tree | ce0e77aa7352886ea844ed63f55d96b4dc681d8b | |
| parent | d3524c1d626389e4b338ea514f110a2c7f84e60a (diff) | |
| download | platform_system_apex-a5f9c449e47515ac3ae1dedece4559014fdf0ab7.tar.gz platform_system_apex-a5f9c449e47515ac3ae1dedece4559014fdf0ab7.tar.bz2 platform_system_apex-a5f9c449e47515ac3ae1dedece4559014fdf0ab7.zip | |
Remove more unused functions
Bug: 165948777
Test: atest ApexTestCases
Change-Id: I7af1cda8a7e1a64f262fc92b6a9b816fae081dbe
| -rw-r--r-- | apexd/apexd.cpp | 13 | ||||
| -rw-r--r-- | apexd/apexd_private.h | 4 |
2 files changed, 1 insertions, 16 deletions
diff --git a/apexd/apexd.cpp b/apexd/apexd.cpp index 093f0be2..7e9695ba 100644 --- a/apexd/apexd.cpp +++ b/apexd/apexd.cpp @@ -644,7 +644,7 @@ Result<void> PrePostinstallPackages(const std::vector<ApexFile>& apexes, Result<MountedApexData> mount_data = apexd_private::getTempMountedApexData(apex.GetManifest().name()); if (!mount_data.ok()) { - mount_data = apexd_private::TempMountPackage(apex, mount_point); + mount_data = VerifyAndTempMountPackage(apex, mount_point); if (!mount_data.ok()) { return mount_data.error(); } @@ -957,12 +957,6 @@ Result<void> MountPackage(const ApexFile& apex, const std::string& mountPoint) { namespace apexd_private { -Result<MountedApexData> TempMountPackage(const ApexFile& apex, - const std::string& mount_point) { - // TODO(b/139041058): consolidate these two methods. - return android::apex::VerifyAndTempMountPackage(apex, mount_point); -} - Result<void> UnmountTempMount(const ApexFile& apex) { const ApexManifest& manifest = apex.GetManifest(); LOG(VERBOSE) << "Unmounting all temp mounts for package " << manifest.name(); @@ -1000,11 +994,6 @@ Result<MountedApexData> getTempMountedApexData(const std::string& package) { return Error() << "No temp mount data found for " << package; } -Result<void> Unmount(const MountedApexData& data) { - // TODO(b/139041058): consolidate these two methods. - return android::apex::Unmount(data); -} - bool IsMounted(const std::string& full_path) { bool found_mounted = false; gMountedApexes.ForallMountedApexes([&](const std::string&, diff --git a/apexd/apexd_private.h b/apexd/apexd_private.h index 25b27898..2c113272 100644 --- a/apexd/apexd_private.h +++ b/apexd/apexd_private.h @@ -41,10 +41,6 @@ android::base::Result<void> BindMount(const std::string& target, const std::string& source); android::base::Result<MountedApexDatabase::MountedApexData> getTempMountedApexData(const std::string& package); -android::base::Result<MountedApexDatabase::MountedApexData> TempMountPackage( - const ApexFile& apex, const std::string& mount_point); -android::base::Result<void> Unmount( - const MountedApexDatabase::MountedApexData& data); android::base::Result<void> UnmountTempMount(const ApexFile& apex); } // namespace apexd_private |