commit 3d274434c78856388484a722da2887ca846907ee
author Calin Juravle <calin@google.com> Fri Aug 08 17:47:43 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 07 18:51:06 2014 +0000
tree 70a1750af1f7e840d1b90e0e54ffc281305b00fe
parent 7f93572650d939a416588a17baab87906d310c40
parent 2f4cf2cfd1125abfe928d6137f3d1553b0888f61

Merge "Pass the name of the native bridge library to the runtime"

core/jni/android_util_Binder.cpp

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index 662af89..4b2f740 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -179,7 +179,10 @@
     env->ExceptionClear();
 
     jstring tagstr = env->NewStringUTF(LOG_TAG);
-    jstring msgstr = env->NewStringUTF(msg);
+    jstring msgstr = NULL;
+    if (tagstr != NULL) {
+        msgstr = env->NewStringUTF(msg);
+    }
 
     if ((tagstr == NULL) || (msgstr == NULL)) {
         env->ExceptionClear();      /* assume exception (OOM?) was thrown */