summaryrefslogtreecommitdiff
path: root/libs/libapexutil/apexutil.cpp
diff options
context:
space:
mode:
authorBernie Innocenti <codewiz@google.com>2020-02-06 22:01:51 +0900
committerBernie Innocenti <codewiz@google.com>2020-02-09 03:59:07 +0900
commitd04d5d0790feac25d86c1031036da3787c4f0307 (patch)
tree4228455ad51823fa7324a8fb33029708f77ad213 /libs/libapexutil/apexutil.cpp
parentf2989addaf762b252d80eb2bc479fa3e649f8278 (diff)
Convert system/apex to Result::ok()
No functionality changes, this is a mechanical cleanup. Test: cd system/apexd && m Change-Id: I479084b9d1101b86c2e8d7ed631feba3edcedd8e
Diffstat (limited to 'libs/libapexutil/apexutil.cpp')
-rw-r--r--libs/libapexutil/apexutil.cpp4
1 files changed, 2 insertions, 2 deletions
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