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

Commit 800083d2 authored by Dimitry Ivanov's avatar Dimitry Ivanov
Browse files

Return nullptr from FindNamespaceByClassLoader for NB-enabled apps. 

This function is always called by the frameworks in order to
initialize vulkan layer path. For NB apps returning nullptr
disables vulkan layer library lookup as expected.

Bug: http://b/32542970
Test: mm
Change-Id: I426b2b9f5ea7227b00f063ed6040f37bb2b4f21f
parent 0945380e

libnativeloader/native_loader.cpp

+4 −4
Original line number Diff line number Diff line
@@ -473,14 +473,14 @@ bool CloseNativeLibrary(void* handle, const bool needs_native_bridge) { 
}



#if defined(__ANDROID__)

// native_bridge_namespaces are not supported for callers of this function.

// This function will return nullptr in the case when application is running

// on native bridge.

android_namespace_t* FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader) {

  std::lock_guard<std::mutex> guard(g_namespaces_mutex);

  // native_bridge_namespaces are not supported for callers of this function.

  // At the moment this is libwebviewchromium_loader and vulkan.

  NativeLoaderNamespace ns;

  if (g_namespaces->FindNamespaceByClassLoader(env, class_loader, &ns)) {

    CHECK(ns.is_android_namespace());

    return ns.get_android_ns();

    return ns.is_android_namespace() ? ns.get_android_ns() : nullptr;

  }



  return nullptr;