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

Commit 97e39b88 authored by Mythri Alle's avatar Mythri Alle Committed by Automerger Merge Worker
Browse files

Merge "Don't enable jdwp by default on userdebug builds" am: 3ade15d2 am:... 

Merge "Don't enable jdwp by default on userdebug builds" am: 3ade15d2 am: 391e8ca7 am: 251978e0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2215481



Change-Id: I89e327ecddf78758052f23f462ae575c0c422943
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 606019bb 251978e0

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

+12 −4
Original line number Diff line number Diff line
@@ -1000,17 +1000,25 @@ public final class Zygote { 
        }

    }



    /**

     * This will enable jdwp by default for all apps. It is OK to cache this property

     * because we expect to reboot the system whenever this property changes

     */

    private static final boolean ENABLE_JDWP = SystemProperties.get(

                          "persist.debuggable.dalvik.vm.jdwp.enabled").equals("1");



    /**

     * Applies debugger system properties to the zygote arguments.

     *

     * If "ro.debuggable" is "1", all apps are debuggable. Otherwise,

     * the debugger state is specified via the "--enable-jdwp" flag

     * in the spawn request.

     * For eng builds all apps are debuggable. On userdebug and user builds

     * if persist.debuggable.dalvik.vm.jdwp.enabled is 1 all apps are

     * debuggable. Otherwise, the debugger state is specified via the

     * "--enable-jdwp" flag in the spawn request.

     *

     * @param args non-null; zygote spawner args

     */

    static void applyDebuggerSystemProperty(ZygoteArguments args) {

        if (RoSystemProperties.DEBUGGABLE) {

        if (Build.IS_ENG || ENABLE_JDWP) {

            args.mRuntimeFlags |= Zygote.DEBUG_ENABLE_JDWP;

        }

    }