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

Commit d5502258 authored by Guang Zhu's avatar Guang Zhu
Browse files

resolve merge conflicts of 723462eb to master. 

Change-Id: I34f085ba12ab2602a144a2cbd933cfd5c030748f
parents 57db2c0d 723462eb

core/jni/AndroidRuntime.cpp

+4 −2
Original line number Diff line number Diff line
@@ -580,7 +580,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
    char heapminfreeOptsBuf[sizeof("-XX:HeapMinFree=")-1 + PROPERTY_VALUE_MAX];

    char heapmaxfreeOptsBuf[sizeof("-XX:HeapMaxFree=")-1 + PROPERTY_VALUE_MAX];

    char usejitOptsBuf[sizeof("-Xusejit:")-1 + PROPERTY_VALUE_MAX];

    char jitcodecachesizeOptsBuf[sizeof("-Xjitcodecachesize:")-1 + PROPERTY_VALUE_MAX];

    char jitmaxsizeOptsBuf[sizeof("-Xjitmaxsize:")-1 + PROPERTY_VALUE_MAX];

    char jitinitialsizeOptsBuf[sizeof("-Xjitinitialsize:")-1 + PROPERTY_VALUE_MAX];

    char jitthresholdOptsBuf[sizeof("-Xjitthreshold:")-1 + PROPERTY_VALUE_MAX];

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

    char backgroundgcOptsBuf[sizeof("-XX:BackgroundGC=")-1 + PROPERTY_VALUE_MAX];
@@ -684,7 +685,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) 
     * JIT related options.

     */

    parseRuntimeOption("dalvik.vm.usejit", usejitOptsBuf, "-Xusejit:");

    parseRuntimeOption("dalvik.vm.jitcodecachesize", jitcodecachesizeOptsBuf, "-Xjitcodecachesize:");

    parseRuntimeOption("dalvik.vm.jitmaxsize", jitmaxsizeOptsBuf, "-Xjitmaxsize:");

    parseRuntimeOption("dalvik.vm.jitinitialsize", jitinitialsizeOptsBuf, "-Xjitinitialsize:");

    parseRuntimeOption("dalvik.vm.jitthreshold", jitthresholdOptsBuf, "-Xjitthreshold:");



    property_get("ro.config.low_ram", propBuf, "");

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -15455,6 +15455,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
                pw.print(" Lost RAM: "); pw.println(stringifyKBSize(memInfo.getTotalSizeKb()

                        - totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()

                        - memInfo.getKernelUsedSizeKb()));

            } else {

                pw.print("lostram,"); pw.println(memInfo.getTotalSizeKb()

                        - totalPss - memInfo.getFreeSizeKb() - memInfo.getCachedSizeKb()

                        - memInfo.getKernelUsedSizeKb());

            }

            if (!brief) {

                if (memInfo.getZramTotalSizeKb() != 0) {