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

Commit 7598a248 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am e816f917: Merge "Frameworks/base: Use system property for cache prune counter" 

* commit 'e816f917':
  Frameworks/base: Use system property for cache prune counter
parents e5bc03da e816f917

core/jni/AndroidRuntime.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -552,6 +552,7 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
    char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];

    char gctypeOptsBuf[sizeof("-Xgc:")-1 + PROPERTY_VALUE_MAX];

    char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];

    char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];

    char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];

    char heaptargetutilizationOptsBuf[sizeof("-XX:HeapTargetUtilization=")-1 + PROPERTY_VALUE_MAX];

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

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

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

    char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];

    char dex2oatXmxImageFlagsBuf[sizeof("-Xmx")-1 + PROPERTY_VALUE_MAX];

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

    char dex2oatXmsFlagsBuf[sizeof("-Xms")-1 + PROPERTY_VALUE_MAX];
@@ -815,6 +816,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv) 
        addOption(nativeBridgeLibrary);

        addOption(nativeBridgeLibrary);

    }

    }





    // Dalvik-cache pruning counter.

    parseRuntimeOption("dalvik.vm.zygote.max-boot-retry", cachePruneBuf,

                       "-Xzygote-max-boot-retry=");



    initArgs.version = JNI_VERSION_1_4;

    initArgs.version = JNI_VERSION_1_4;

    initArgs.options = mOptions.editArray();

    initArgs.options = mOptions.editArray();

    initArgs.nOptions = mOptions.size();

    initArgs.nOptions = mOptions.size();