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

Commit aa02ddf7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eeb am:... 

Merge "Merge "Add dalvik.vm.force-java-zygote-fork-loop" am: a8540eeb am: 12f58973 am: 13945aad" into sc-v2-dev-plus-aosp am: 2003c586

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

Change-Id: I0a2b9cfab146c799361f53d33356aef671b993aa
parents b9046f42 2003c586

core/jni/AndroidRuntime.cpp

+8 −0
Original line number Original line Diff line number Diff line
@@ -690,6 +690,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];

    char methodTraceFileBuf[sizeof("-Xmethod-trace-file:") + PROPERTY_VALUE_MAX];

    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    char methodTraceFileSizeBuf[sizeof("-Xmethod-trace-file-size:") + PROPERTY_VALUE_MAX];

    std::string fingerprintBuf;

    std::string fingerprintBuf;

    char javaZygoteForkLoopBuf[sizeof("-XX:ForceJavaZygoteForkLoop=") + PROPERTY_VALUE_MAX];

    char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];

    char jdwpProviderBuf[sizeof("-XjdwpProvider:") - 1 + PROPERTY_VALUE_MAX];

    char opaqueJniIds[sizeof("-Xopaque-jni-ids:") - 1 + PROPERTY_VALUE_MAX];

    char opaqueJniIds[sizeof("-Xopaque-jni-ids:") - 1 + PROPERTY_VALUE_MAX];

    char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];

    char bootImageBuf[sizeof("-Ximage:") - 1 + PROPERTY_VALUE_MAX];
@@ -907,6 +908,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 




    parseRuntimeOption("dalvik.vm.backgroundgctype", backgroundgcOptsBuf, "-XX:BackgroundGC=");

    parseRuntimeOption("dalvik.vm.backgroundgctype", backgroundgcOptsBuf, "-XX:BackgroundGC=");





    /*

     * Enable/disable zygote native fork loop.

     */

    parseRuntimeOption("dalvik.vm.force-java-zygote-fork-loop",

                       javaZygoteForkLoopBuf,

                       "-XX:ForceJavaZygoteForkLoop=");



    /*

    /*

     * Enable debugging only for apps forked from zygote.

     * Enable debugging only for apps forked from zygote.

     */

     */