diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java index 915baab9a6e45..34200077044df 100644 --- a/core/java/android/os/ZygoteProcess.java +++ b/core/java/android/os/ZygoteProcess.java @@ -649,11 +649,13 @@ public class ZygoteProcess { Boolean.parseBoolean(USAP_POOL_ENABLED_DEFAULT)); } - if (origVal != mUsapPoolEnabled) { + boolean valueChanged = origVal != mUsapPoolEnabled; + + if (valueChanged) { Log.i(LOG_TAG, "usapPoolEnabled = " + mUsapPoolEnabled); } - return origVal != mUsapPoolEnabled; + return valueChanged; } private boolean mIsFirstPropCheck = true; diff --git a/core/java/com/android/internal/os/ZygoteConfig.java b/core/java/com/android/internal/os/ZygoteConfig.java index c8ff51e77866a..c6af8c2f43164 100644 --- a/core/java/com/android/internal/os/ZygoteConfig.java +++ b/core/java/com/android/internal/os/ZygoteConfig.java @@ -24,14 +24,14 @@ package com.android.internal.os; public class ZygoteConfig { /** 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 */ - 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 */ - 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 */ - public static final String USAP_POOL_SIZE_MIN = "blastula_pool_size_min"; + public static final String USAP_POOL_SIZE_MIN = "usap_pool_size_min"; } diff --git a/core/java/com/android/internal/os/ZygoteServer.java b/core/java/com/android/internal/os/ZygoteServer.java index 3f3aba9b66820..5d1911b9c29a2 100644 --- a/core/java/com/android/internal/os/ZygoteServer.java +++ b/core/java/com/android/internal/os/ZygoteServer.java @@ -353,6 +353,8 @@ class ZygoteServer { return null; } + Log.i(TAG, "USAP Pool status change: " + (newStatus ? "ENABLED" : "DISABLED")); + mUsapPoolEnabled = newStatus; if (newStatus) {