From 56167f56143a4b36fd630b25d43c52d0ac6c682a Mon Sep 17 00:00:00 2001 From: Florian Mayer Date: Thu, 10 Feb 2022 17:06:59 -0800 Subject: [PATCH] [MTE] Fix app_default property. We would decide after checking for TBI, which is enabled for most apps. Test: add log statement to the case, check it gets triggered Bug: 216305376 Change-Id: I79bd9e932ad2fb75a3b68dfa062bb3433fe4784e --- .../core/java/com/android/server/am/ProcessList.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index c4163e6acb2f8..763bbee664236 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -1718,17 +1718,18 @@ public final class ProcessList { return Zygote.MEMORY_TAG_LEVEL_NONE; } - // Check to see that the compat feature for TBI is enabled. - if (mPlatformCompat.isChangeEnabled(NATIVE_HEAP_POINTER_TAGGING, app.info)) { - return Zygote.MEMORY_TAG_LEVEL_TBI; - } - String defaultLevel = SystemProperties.get("persist.arm64.memtag.app_default"); if ("sync".equals(defaultLevel)) { return Zygote.MEMORY_TAG_LEVEL_SYNC; } else if ("async".equals(defaultLevel)) { return Zygote.MEMORY_TAG_LEVEL_ASYNC; } + + // Check to see that the compat feature for TBI is enabled. + if (mPlatformCompat.isChangeEnabled(NATIVE_HEAP_POINTER_TAGGING, app.info)) { + return Zygote.MEMORY_TAG_LEVEL_TBI; + } + return Zygote.MEMORY_TAG_LEVEL_NONE; }