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

Commit f74eb32c authored by David Sehr's avatar David Sehr Committed by android-build-merger
Browse files

Merge "Allow tuning of heaptargetutilization" am: 0e3e2a73 

am: e673072f

Change-Id: Ia7114c1d9fbee42ce27372947702c580bfd3159c
parents e2dc83dd e673072f

core/java/com/android/internal/os/RuntimeInit.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -30,8 +30,10 @@ import android.os.SystemProperties; 
import android.os.Trace;

import android.os.Trace;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;



import com.android.internal.logging.AndroidConfig;

import com.android.internal.logging.AndroidConfig;

import com.android.server.NetworkManagementSocketTagger;

import com.android.server.NetworkManagementSocketTagger;



import dalvik.system.RuntimeHooks;

import dalvik.system.RuntimeHooks;

import dalvik.system.VMRuntime;

import dalvik.system.VMRuntime;
@@ -374,9 +376,6 @@ public class RuntimeInit { 
        // leftover running threads to crash before the process actually exits.

        // leftover running threads to crash before the process actually exits.

        nativeSetExitWithoutCleanup(true);

        nativeSetExitWithoutCleanup(true);





        // We want to be fairly aggressive about heap utilization, to avoid

        // holding on to a lot of memory that isn't needed.

        VMRuntime.getRuntime().setTargetHeapUtilization(0.75f);

        VMRuntime.getRuntime().setTargetSdkVersion(targetSdkVersion);

        VMRuntime.getRuntime().setTargetSdkVersion(targetSdkVersion);





        final Arguments args = new Arguments(argv);

        final Arguments args = new Arguments(argv);

services/java/com/android/server/SystemServer.java

+0 −4
Original line number Original line Diff line number Diff line
@@ -446,10 +446,6 @@ public final class SystemServer { 
            // Mmmmmm... more memory!

            // Mmmmmm... more memory!

            VMRuntime.getRuntime().clearGrowthLimit();

            VMRuntime.getRuntime().clearGrowthLimit();





            // The system server has to run all of the time, so it needs to be

            // as efficient as possible with its memory usage.

            VMRuntime.getRuntime().setTargetHeapUtilization(0.8f);



            // Some devices rely on runtime fingerprint generation, so make sure

            // Some devices rely on runtime fingerprint generation, so make sure

            // we've defined it before booting further.

            // we've defined it before booting further.

            Build.ensureFingerprintProperty();

            Build.ensureFingerprintProperty();