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

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

Merge "Make FinalizerTimeoutMs and ThreadSuspendTimeout system prop" am: e021e1f7 

Change-Id: If21e3471882328a5cd7d2da50bf96a2a6be35d69
parents 09d92456 e021e1f7

core/jni/AndroidRuntime.cpp

+11 −1
Original line number Diff line number Diff line
@@ -672,6 +672,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];

    char foregroundHeapGrowthMultiplierOptsBuf[

            sizeof("-XX:ForegroundHeapGrowthMultiplier=")-1 + PROPERTY_VALUE_MAX];

    char finalizerTimeoutMsOptsBuf[sizeof("-XX:FinalizerTimeoutMs=")-1 + PROPERTY_VALUE_MAX];

    char threadSuspendTimeoutOptsBuf[sizeof("-XX:ThreadSuspendTimeout=")-1 + PROPERTY_VALUE_MAX];

    char cachePruneBuf[sizeof("-Xzygote-max-boot-retry=")-1 + PROPERTY_VALUE_MAX];

    char dex2oatXmsImageFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];

    char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];
@@ -825,7 +827,15 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p 
    parseRuntimeOption("dalvik.vm.foreground-heap-growth-multiplier",

                       foregroundHeapGrowthMultiplierOptsBuf,

                       "-XX:ForegroundHeapGrowthMultiplier=");



    /*

     * Finalizer and thread suspend timeouts.

     */

    parseRuntimeOption("dalvik.vm.finalizer-timeout-ms",

                       finalizerTimeoutMsOptsBuf,

                       "-XX:FinalizerTimeoutMs=");

    parseRuntimeOption("dalvik.vm.thread-suspend-timeout-ms",

                       threadSuspendTimeoutOptsBuf,

                       "-XX:ThreadSuspendTimeout=");

    /*

     * JIT related options.

     */