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

Commit b65fecd8 authored by Alex Light's avatar Alex Light Committed by android-build-merger
Browse files

Merge "Make AndroidRuntime only start the debugger for zygote forked apps." am: 5cdf28f3 

am: 710b7c66

Change-Id: I76a047647aaae7b50d62292ba04bd93350ba234c
parents 7ec87ba8 710b7c66

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,