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

Commit 4b58630e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed a property naming mismatch."

parents f09c91b2 da5b64e7

core/java/android/os/ZygoteProcess.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -649,11 +649,13 @@ public class ZygoteProcess { 
                    Boolean.parseBoolean(USAP_POOL_ENABLED_DEFAULT));

                    Boolean.parseBoolean(USAP_POOL_ENABLED_DEFAULT));

        }

        }





        if (origVal != mUsapPoolEnabled) {

        boolean valueChanged = origVal != mUsapPoolEnabled;



        if (valueChanged) {

            Log.i(LOG_TAG, "usapPoolEnabled = " + mUsapPoolEnabled);

            Log.i(LOG_TAG, "usapPoolEnabled = " + mUsapPoolEnabled);

        }

        }





        return origVal != mUsapPoolEnabled;

        return valueChanged;

    }

    }





    private boolean mIsFirstPropCheck = true;

    private boolean mIsFirstPropCheck = true;

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -24,14 +24,14 @@ package com.android.internal.os; 
public class ZygoteConfig {

public class ZygoteConfig {





    /** If {@code true}, enables the unspecialized app process (USAP) pool feature */

    /** If {@code true}, enables the unspecialized app process (USAP) pool feature */

    public static final String USAP_POOL_ENABLED = "blastula_pool_enabled";

    public static final String USAP_POOL_ENABLED = "usap_pool_enabled";





    /** The threshold used to determine if the pool should be refilled */

    /** The threshold used to determine if the pool should be refilled */

    public static final String USAP_POOL_REFILL_THRESHOLD = "blastula_refill_threshold";

    public static final String USAP_POOL_REFILL_THRESHOLD = "usap_refill_threshold";





    /** The maximum number of processes to keep in the USAP pool */

    /** The maximum number of processes to keep in the USAP pool */

    public static final String USAP_POOL_SIZE_MAX = "blastula_pool_size_max";

    public static final String USAP_POOL_SIZE_MAX = "usap_pool_size_max";





    /** The minimum number of processes to keep in the USAP pool */

    /** The minimum number of processes to keep in the USAP pool */

    public static final String USAP_POOL_SIZE_MIN = "blastula_pool_size_min";

    public static final String USAP_POOL_SIZE_MIN = "usap_pool_size_min";

}
 
}

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -353,6 +353,8 @@ class ZygoteServer { 
            return null;

            return null;

        }

        }





        Log.i(TAG, "USAP Pool status change: " + (newStatus ? "ENABLED" : "DISABLED"));



        mUsapPoolEnabled = newStatus;

        mUsapPoolEnabled = newStatus;





        if (newStatus) {

        if (newStatus) {