commit 94f3e47da5acc48b1003b64acdc539cdf6cbe30c
author Calin Juravle <calin@google.com> Fri Aug 08 17:48:02 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 07 18:42:30 2014 +0000
tree 25ab4290e870b56317da74d1a3ab3384484429c7
parent 3d274434c78856388484a722da2887ca846907ee
parent 219b53567376bdccba16ca55af8ac2633a924c1b

Merge "Fix the instruction set for dex file during (re)moving ops."

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 */