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

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

Merge "[MTE] do not show notification for persistent MTE"

parents a77b86f6 b32d8426
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -5335,7 +5335,14 @@ public class ActivityManagerService extends IActivityManager.Stub
    }
    private void showMteOverrideNotificationIfActive() {
        if (!SystemProperties.getBoolean("ro.arm64.memtag.bootctl_supported", false)
        String bootctl = SystemProperties.get("arm64.memtag.bootctl");
        // If MTE is on, there is one in three cases:
        // * a fullmte build: ro.arm64.memtag.bootctl_supported is not set
        // * memtag: arm64.memtag.bootctl contains "memtag"
        // * memtag-once
        // In the condition below we detect memtag-once by exclusion.
        if (Arrays.asList(bootctl.split(",")).contains("memtag")
            || !SystemProperties.getBoolean("ro.arm64.memtag.bootctl_supported", false)
            || !com.android.internal.os.Zygote.nativeSupportsMemoryTagging()) {
            return;
        }