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

Commit 76e032ad authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam Committed by android-build-merger
Browse files

Merge "Replace StatusOr<T> with Result<T>" into qt-dev-plus-aosp am: e2fcbf4d 

am: 7f24a875

Change-Id: Ia7e6236705d961c14a72d8e21d1dba84dc84c501
parents a575768d 7f24a875

cmds/installd/otapreopt_chroot.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -72,9 +72,10 @@ static std::vector<apex::ApexFile> ActivateApexPackages() { 
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();

        apex::Status status = apex::deactivatePackage(package_path);

        base::Result<void> status = apex::deactivatePackage(package_path);

        if (!status.Ok()) {

        if (!status) {

            LOG(ERROR) << "Failed to deactivate " << package_path << ": " << status.ErrorMessage();

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

                       << status.error();

        }

        }

    }

    }

}

}