commit 7ac860e54f520abad2ae87def8c3b4e04f3a3696
author Steven Moreland <smoreland@google.com> Wed Dec 30 19:23:26 2020
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 30 19:23:26 2020
tree 17ee2bcbf9fdc920fb053042351c7ef8bc583459
parent f30487a146252d94fe4e42b65f2801933ca41ffa
parent 4da8fb0f71b87d53e4b63fcc5671847d03982317

Merge "libbinder: only set sm stability if non-null"

cmds/installd/otapreopt_chroot.cpp

diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp
index 6459805..72c03bf 100644
--- a/cmds/installd/otapreopt_chroot.cpp
+++ b/cmds/installd/otapreopt_chroot.cpp
@@ -68,15 +68,15 @@
                                        apex::kApexPackageVendorDir};
     for (const auto& dir : apex_dirs) {
         // Cast call to void to suppress warn_unused_result.
-        static_cast<void>(apex::scanPackagesDirAndActivate(dir));
+        static_cast<void>(apex::ScanPackagesDirAndActivate(dir));
     }
-    return apex::getActivePackages();
+    return apex::GetActivePackages();
 }
 
 static void DeactivateApexPackages(const std::vector<apex::ApexFile>& active_packages) {
     for (const apex::ApexFile& apex_file : active_packages) {
         const std::string& package_path = apex_file.GetPath();
-        base::Result<void> status = apex::deactivatePackage(package_path);
+        base::Result<void> status = apex::DeactivatePackage(package_path);
         if (!status.ok()) {
             LOG(ERROR) << "Failed to deactivate " << package_path << ": "
                        << status.error();