ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Return nullptr from FindNamespaceByClassLoader for NB-enabled apps." am: c54c533cf6

Browse source 
am: b870bbd69a

Change-Id: I15d9d46071941e871e332ae5ab83fc4a3b73042c
This commit is contained in:
Dimitry Ivanov 2016-11-02 16:09:47 +00:00 • committed by android-build-merger
commit 011074f0da
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnativeloader/native_loader.cpp
View file

@ -473,14 +473,14 @@ bool CloseNativeLibrary(void* handle, const bool needs_native_bridge) {
} }
#if defined(__ANDROID__) #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) { android_namespace_t* FindNamespaceByClassLoader(JNIEnv* env, jobject class_loader) {
std::lock_guard<std::mutex> guard(g_namespaces_mutex); 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; NativeLoaderNamespace ns;
if (g_namespaces->FindNamespaceByClassLoader(env, class_loader, &ns)) { if (g_namespaces->FindNamespaceByClassLoader(env, class_loader, &ns)) {
CHECK(ns.is_android_namespace()); return ns.is_android_namespace() ? ns.get_android_ns() : nullptr;
return ns.get_android_ns();
} }
return nullptr; return nullptr;