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

Commit e8626dee authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for... 

Merge "Merge "Revert "Revert "Make AndroidRuntime only start the debugger for zygote forked apps.""" am: 3b50dc3d am: 98568f57" into oc-mr1-dev-plus-aosp
parents 5b46d98a 65c892c1

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,