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

Commit 38507180 authored by Florian Mayer's avatar Florian Mayer Committed by Android (Google) Code Review
Browse files

Merge "[MTE] Respect persist.arm64.memtag.default for system server."

parents 0be2f8b9 c9be4eb9

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

+7 −4
Original line number Diff line number Diff line
@@ -736,10 +736,13 @@ public class ZygoteInit { 
            Zygote.applyInvokeWithSystemProperty(parsedArgs);



            if (Zygote.nativeSupportsMemoryTagging()) {

                String mode = SystemProperties.get("arm64.memtag.process.system_server", "");

                if (mode.isEmpty()) {

                  /* The system server has ASYNC MTE by default, in order to allow

                   * system services to specify their own MTE level later, as you

                   * can't re-enable MTE once it's disabled. */

                String mode = SystemProperties.get("arm64.memtag.process.system_server", "async");

                  mode = SystemProperties.get("persist.arm64.memtag.default", "async");

                }

                if (mode.equals("async")) {

                    parsedArgs.mRuntimeFlags |= Zygote.MEMORY_TAG_LEVEL_ASYNC;

                } else if (mode.equals("sync")) {