1 files changed, 13 insertions, 13 deletions

diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp
index a9b22468ee..b20be9175f 100644
--- a/libnativeloader/library_namespaces.cpp
+++ b/libnativeloader/library_namespaces.cpp
@@ -235,27 +235,27 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t
   auto app_ns = NativeLoaderNamespace::Create(
       namespace_name, library_path, permitted_path, parent_ns, is_shared,
       target_sdk_version < 24 /* is_greylist_enabled */, also_used_as_anonymous);
-  if (!app_ns) {
+  if (!app_ns.ok()) {
     return app_ns.error();
   }
   // ... and link to other namespaces to allow access to some public libraries
   bool is_bridged = app_ns->IsBridged();
 
   auto platform_ns = NativeLoaderNamespace::GetSystemNamespace(is_bridged);
-  if (!platform_ns) {
+  if (!platform_ns.ok()) {
     return platform_ns.error();
   }
 
   auto linked = app_ns->Link(*platform_ns, system_exposed_libraries);
-  if (!linked) {
+  if (!linked.ok()) {
     return linked.error();
   }
 
   auto art_ns = NativeLoaderNamespace::GetExportedNamespace(kArtNamespaceName, is_bridged);
   // ART APEX does not exist on host, and under certain build conditions.
-  if (art_ns) {
+  if (art_ns.ok()) {
     linked = app_ns->Link(*art_ns, art_public_libraries());
-    if (!linked) {
+    if (!linked.ok()) {
       return linked.error();
     }
   }
@@ -263,9 +263,9 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t
   // Give access to NNAPI libraries (apex-updated LLNDK library).
   auto nnapi_ns =
       NativeLoaderNamespace::GetExportedNamespace(kNeuralNetworksNamespaceName, is_bridged);
-  if (nnapi_ns) {
+  if (nnapi_ns.ok()) {
     linked = app_ns->Link(*nnapi_ns, neuralnetworks_public_libraries());
-    if (!linked) {
+    if (!linked.ok()) {
       return linked.error();
     }
   }
@@ -273,9 +273,9 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t
   // Give access to VNDK-SP libraries from the 'vndk' namespace.
   if (unbundled_vendor_or_product_app && !vndksp_libraries().empty()) {
     auto vndk_ns = NativeLoaderNamespace::GetExportedNamespace(kVndkNamespaceName, is_bridged);
-    if (vndk_ns) {
+    if (vndk_ns.ok()) {
       linked = app_ns->Link(*vndk_ns, vndksp_libraries());
-      if (!linked) {
+      if (!linked.ok()) {
         return linked.error();
       }
     }
@@ -284,9 +284,9 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t
   // TODO(b/143733063): Remove it after library path of apex module is supported.
   auto cronet_ns =
       NativeLoaderNamespace::GetExportedNamespace(kCronetNamespaceName, is_bridged);
-  if (cronet_ns) {
+  if (cronet_ns.ok()) {
     linked = app_ns->Link(*cronet_ns, cronet_public_libraries());
-    if (!linked) {
+    if (!linked.ok()) {
       return linked.error();
     }
   }
@@ -295,9 +295,9 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t
     auto vendor_ns = NativeLoaderNamespace::GetExportedNamespace(kVendorNamespaceName, is_bridged);
     // when vendor_ns is not configured, link to the system namespace
     auto target_ns = vendor_ns ? vendor_ns : platform_ns;
-    if (target_ns) {
+    if (target_ns.ok()) {
       linked = app_ns->Link(*target_ns, vendor_public_libraries());
-      if (!linked) {
+      if (!linked.ok()) {
         return linked.error();
       }
     }