Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40299518 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Rename android::apex functions" am: f30487a1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1535140

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad88bc96cd2f3410877622b44a1fbbbeeaf2ac19
parents 4482b41b f30487a1

cmds/installd/otapreopt_chroot.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -68,15 +68,15 @@ static std::vector<apex::ApexFile> ActivateApexPackages() { 
                                       apex::kApexPackageVendorDir};

                                       apex::kApexPackageVendorDir};

    for (const auto& dir : apex_dirs) {

    for (const auto& dir : apex_dirs) {

        // Cast call to void to suppress warn_unused_result.

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

static void DeactivateApexPackages(const std::vector<apex::ApexFile>& active_packages) {

    for (const apex::ApexFile& apex_file : active_packages) {

    for (const apex::ApexFile& apex_file : active_packages) {

        const std::string& package_path = apex_file.GetPath();

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

        if (!status.ok()) {

            LOG(ERROR) << "Failed to deactivate " << package_path << ": "

            LOG(ERROR) << "Failed to deactivate " << package_path << ": "

                       << status.error();

                       << status.error();