From d04d5d0790feac25d86c1031036da3787c4f0307 Mon Sep 17 00:00:00 2001 From: Bernie Innocenti Date: Thu, 6 Feb 2020 22:01:51 +0900 Subject: Convert system/apex to Result::ok() No functionality changes, this is a mechanical cleanup. Test: cd system/apexd && m Change-Id: I479084b9d1101b86c2e8d7ed631feba3edcedd8e --- libs/libapexutil/apexutil.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/libapexutil/apexutil.cpp') diff --git a/libs/libapexutil/apexutil.cpp b/libs/libapexutil/apexutil.cpp index 948bd86..e0b0787 100644 --- a/libs/libapexutil/apexutil.cpp +++ b/libs/libapexutil/apexutil.cpp @@ -69,7 +69,7 @@ GetActivePackages(const std::string &apex_root) { continue; std::string apex_path = apex_root + "/" + entry->d_name; auto manifest = ParseApexManifest(apex_path + "/apex_manifest.pb"); - if (manifest) { + if (manifest.ok()) { apexes.emplace(std::move(apex_path), std::move(*manifest)); } else { LOG(WARNING) << manifest.error(); @@ -79,4 +79,4 @@ GetActivePackages(const std::string &apex_root) { } } // namespace apex -} // namespace android \ No newline at end of file +} // namespace android -- cgit v1.2.3