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

Commit c1aa80ab authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by android-build-merger
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
am: e8626dee

Change-Id: Ia800a77c6c172770726e4fd2a132137ae209eb45
parents 29209af8 e8626dee

core/jni/AndroidRuntime.cpp

+6 −7
Original line number Diff line number Diff line
@@ -766,17 +766,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,