Merge "Disable USAP when running in jitzygote mode." into qt-dev

2019-04-10 21:23:08 +00:00
parent fa1676bd18 fd00e94dd1
commit 5e05627687
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/os/ZygoteProcess.java
+++ b/core/java/android/os/ZygoteProcess.java
@@ -646,9 +646,14 @@ public class ZygoteProcess {
                ZygoteConfig.USAP_POOL_ENABLED, USAP_POOL_ENABLED_DEFAULT);

        if (!propertyString.isEmpty()) {
-            mUsapPoolEnabled = Zygote.getConfigurationPropertyBoolean(
+            if (SystemProperties.get("dalvik.vm.boot-image", "").endsWith("apex.art")) {
+                // TODO(b/119800099): Tweak usap configuration in jitzygote mode.
+                mUsapPoolEnabled = false;
+            } else {
+                mUsapPoolEnabled = Zygote.getConfigurationPropertyBoolean(
                    ZygoteConfig.USAP_POOL_ENABLED,
                    Boolean.parseBoolean(USAP_POOL_ENABLED_DEFAULT));
+            }
        }

        boolean valueChanged = origVal != mUsapPoolEnabled;