commit b344dfaee95be045a58913a0fd81d9c532684d42
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 23 04:40:54 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 23 04:40:54 2022 +0000
tree 601c54c520ef6c0aa4027c849d6deeadb35251f6
parent bf901995db13afb6fee2ca417b05aaa9fcae6cfb
parent 46d4a1a836a97f8a628830189ec3e0924429c88a

Merge "JavaBBinder::onTransact - log if env null"

core/jni/android_util_Binder.cpp

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index 13ca133..f28e2f6 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -396,6 +396,9 @@
     {
         JNIEnv* env = javavm_to_jnienv(mVM);
 
+        LOG_ALWAYS_FATAL_IF(env == nullptr,
+                            "Binder thread started or Java binder used, but env null. Attach JVM?");
+
         ALOGV("onTransact() on %p calling object %p in env %p vm %p\n", this, mObject, env, mVM);
 
         IPCThreadState* thread_state = IPCThreadState::self();