Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae07ecf3 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Add the "debug.jni.logging" property so third-party developers can debug their JNI problems. 

This turns on the super-verbose but indispensible logging of all native method
calls and all calls to JNI functions (for third-party code only). In particular,
if you have a local reference bug, you can search for the reference given in
the crash and see exactly where it came from. In every case I've seen so far,
that's pinpointed the bug exactly.

Change-Id: Ifb7ba02ae637bdd53cd8500febdcb9d4d7799bda
parent a0c26920

core/java/android/os/Process.java

+3 −0
Original line number Diff line number Diff line
@@ -522,6 +522,9 @@ public class Process { 
            argsForZygote.add("--runtime-init");

            argsForZygote.add("--setuid=" + uid);

            argsForZygote.add("--setgid=" + gid);

            if ((debugFlags & Zygote.DEBUG_ENABLE_JNI_LOGGING) != 0) {

                argsForZygote.add("--enable-jni-logging");

            }

            if ((debugFlags & Zygote.DEBUG_ENABLE_SAFEMODE) != 0) {

                argsForZygote.add("--enable-safemode");

            }

core/java/com/android/internal/os/ZygoteConnection.java

+4 −2
Original line number Diff line number Diff line
@@ -328,8 +328,8 @@ class ZygoteConnection { 
        boolean peerWait;



        /**

         * From --enable-debugger, --enable-checkjni, --enable-assert, and

         * --enable-safemode

         * From --enable-debugger, --enable-checkjni, --enable-assert,

         * --enable-safemode, and --enable-jni-logging.

         */

        int debugFlags;
@@ -408,6 +408,8 @@ class ZygoteConnection { 
                    debugFlags |= Zygote.DEBUG_ENABLE_SAFEMODE;

                } else if (arg.equals("--enable-checkjni")) {

                    debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;

                } else if (arg.equals("--enable-jni-logging")) {

                    debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

                } else if (arg.equals("--enable-assert")) {

                    debugFlags |= Zygote.DEBUG_ENABLE_ASSERT;

                } else if (arg.equals("--peer-wait")) {

services/java/com/android/server/am/ActivityManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -1953,6 +1953,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
            if ("1".equals(SystemProperties.get("debug.checkjni"))) {

                debugFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;

            }

            if ("1".equals(SystemProperties.get("debug.jni.logging"))) {

                debugFlags |= Zygote.DEBUG_ENABLE_JNI_LOGGING;

            }

            if ("1".equals(SystemProperties.get("debug.assert"))) {

                debugFlags |= Zygote.DEBUG_ENABLE_ASSERT;

            }