Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use modified android_dlwarning" into nyc-dev

Browse Source
This commit is contained in:
Dimitry Ivanov
2016-03-03 21:07:52 +00:00
committed by Android (Google) Code Review
parent 7aa090e793 ddbf6c700b
commit ca9605fc28
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_app_Activity.cpp
View File

@@ -15,16 +15,25 @@
*/
#include <poll.h>
#include <android/dlext.h>
#include <string>
#include "core_jni_helpers.h"
extern "C" void android_dlwarning(void*, void (*)(void*, const char*));
namespace android
{
static jstring getDlWarning_native(JNIEnv* env, jobject) {
const char* text = android_dlwarning();
return text == nullptr ? nullptr : env->NewStringUTF(text);
std::string msg;
android_dlwarning(&msg, [](void* obj, const char* msg) {
if (msg != nullptr) {
*reinterpret_cast<std::string*>(obj) = msg;
}
});
return msg.empty() ? nullptr : env->NewStringUTF(msg.c_str());
}
static const JNINativeMethod g_methods[] = {