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

Commit 93e258b2 authored by Mathieu Chartier's avatar Mathieu Chartier Committed by Android (Google) Code Review
Browse files

Merge "Fix logic for use_app_image_startup_cache flag"

parents 0ff1a805 77bd1236

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

+0 −10
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.system.OsConstants; 
import android.system.StructCapUserData;

import android.system.StructCapUserHeader;

import android.text.Hyphenator;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;

import android.util.Slog;
@@ -85,8 +84,6 @@ public class ZygoteInit { 


    private static final String PROPERTY_DISABLE_OPENGL_PRELOADING = "ro.zygote.disable_gl_preload";

    private static final String PROPERTY_GFX_DRIVER = "ro.gfx.driver.0";

    private static final String PROPERTY_USE_APP_IMAGE_STARTUP_CACHE =

            "persist.device_config.runtime_native.use_app_image_startup_cache";



    private static final int LOG_BOOT_PROGRESS_PRELOAD_START = 3020;

    private static final int LOG_BOOT_PROGRESS_PRELOAD_END = 3030;
@@ -708,13 +705,6 @@ public class ZygoteInit { 
                parsedArgs.mRuntimeFlags |= Zygote.PROFILE_SYSTEM_SERVER;

            }



            String use_app_image_cache = SystemProperties.get(

                    PROPERTY_USE_APP_IMAGE_STARTUP_CACHE, "");

            // Property defaults to true currently.

            if (!TextUtils.isEmpty(use_app_image_cache) && !use_app_image_cache.equals("false")) {

                parsedArgs.mRuntimeFlags |= Zygote.USE_APP_IMAGE_STARTUP_CACHE;

            }



            /* Request to fork the system server process */

            pid = Zygote.forkSystemServer(

                    parsedArgs.mUid, parsedArgs.mGid,

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

+11 −0
Original line number Diff line number Diff line
@@ -249,6 +249,10 @@ public final class ProcessList { 
    // Threshold of number of cached+empty where we consider memory critical.

    static final int TRIM_LOW_THRESHOLD = 5;



    // If true, then we pass the flag to ART to load the app image startup cache.

    private static final String PROPERTY_USE_APP_IMAGE_STARTUP_CACHE =

            "persist.device_config.runtime_native.use_app_image_startup_cache";



    // Low Memory Killer Daemon command codes.

    // These must be kept in sync with the definitions in lmkd.c

    //
@@ -1559,6 +1563,13 @@ public final class ProcessList { 
                runtimeFlags |= policyBits;

            }



            String useAppImageCache = SystemProperties.get(

                    PROPERTY_USE_APP_IMAGE_STARTUP_CACHE, "");

            // Property defaults to true currently.

            if (!TextUtils.isEmpty(useAppImageCache) && !useAppImageCache.equals("false")) {

                runtimeFlags |= Zygote.USE_APP_IMAGE_STARTUP_CACHE;

            }



            String invokeWith = null;

            if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {

                // Debuggable apps may include a wrapper script with their library directory.