summaryrefslogtreecommitdiff
path: root/libnativeloader/native_loader_namespace.cpp
diff options
context:
space:
mode:
authorBernie Innocenti <codewiz@google.com>2020-02-06 15:43:57 +0900
committerBernie Innocenti <codewiz@google.com>2020-02-07 11:41:44 +0000
commit4bd58951456ac6082e23a1931293965852c24281 (patch)
treedd263ff127686a283290ca8dd572a9d5f54879ee /libnativeloader/native_loader_namespace.cpp
parent22be0659402081b59d84d01ec3e7f8aec42d18ad (diff)
Convert art/ to Result::ok()
No functionality changes, this is a mechanical cleanup. Test: m Change-Id: I10030314ad8a06d49a63f1e2f3c5aa5b484e34b6
Diffstat (limited to 'libnativeloader/native_loader_namespace.cpp')
-rw-r--r--libnativeloader/native_loader_namespace.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libnativeloader/native_loader_namespace.cpp b/libnativeloader/native_loader_namespace.cpp
index 6faa78cdde..49f3035dd5 100644
--- a/libnativeloader/native_loader_namespace.cpp
+++ b/libnativeloader/native_loader_namespace.cpp
@@ -68,9 +68,9 @@ Result<NativeLoaderNamespace> NativeLoaderNamespace::GetExportedNamespace(const
// "default" always exists.
Result<NativeLoaderNamespace> NativeLoaderNamespace::GetSystemNamespace(bool is_bridged) {
auto ns = GetExportedNamespace(kSystemNamespaceName, is_bridged);
- if (ns) return ns;
+ if (ns.ok()) return ns;
ns = GetExportedNamespace(kDefaultNamespaceName, is_bridged);
- if (ns) return ns;
+ if (ns.ok()) return ns;
// If nothing is found, return NativeLoaderNamespace constructed from nullptr.
// nullptr also means default namespace to the linker.
@@ -95,7 +95,7 @@ Result<NativeLoaderNamespace> NativeLoaderNamespace::Create(
// Fall back to the system namespace if no parent is set.
auto system_ns = GetSystemNamespace(is_bridged);
- if (!system_ns) {
+ if (!system_ns.ok()) {
return system_ns.error();
}
const NativeLoaderNamespace& effective_parent = parent != nullptr ? *parent : *system_ns;