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

Commit daf17d41 authored by Alex Light's avatar Alex Light
Browse files

Make AndroidRuntime only start the debugger for zygote forked apps. 

This got changed unintentionally in commit fffb273a. Restore the
original behavior where JDWP will not be enabled for non-zygote apps.

Bug: 72400560
Test: atest CtsJdwpSecurityHostTestCases
Change-Id: I364a9d8b6e87efc1604741a7e5dd68221ed8e491
parent ac2247c4

core/jni/AndroidRuntime.cpp

+6 −7
Original line number Diff line number Diff line
@@ -761,17 +761,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 


    /*

     * Enable debugging only for apps forked from zygote.

     * Set suspend=y to pause during VM init and use android ADB transport.

     */

    if (zygote) {

      // Set the JDWP provider and required arguments. By default let the runtime choose how JDWP is

      // implemented. When this is not set the runtime defaults to not allowing JDWP.

      addOption("-XjdwpOptions:suspend=n,server=y");

    }



    // Set the JDWP provider. By default let the runtime choose.

      parseRuntimeOption("dalvik.vm.jdwp-provider",

                         jdwpProviderBuf,

                         "-XjdwpProvider:",

                         "default");

    }



    parseRuntimeOption("dalvik.vm.lockprof.threshold",

                       lockProfThresholdBuf,