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

Commit 11561997 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

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

am: 5e056276

Change-Id: I9d062ca74955639e5348826a611751335f18e77a
parents b7c6d9aa 5e056276

core/java/android/os/ZygoteProcess.java

+6 −1
Original line number Diff line number Diff line
@@ -646,10 +646,15 @@ public class ZygoteProcess { 
                ZygoteConfig.USAP_POOL_ENABLED, USAP_POOL_ENABLED_DEFAULT);



        if (!propertyString.isEmpty()) {

            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;