summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter Collingbourne <pcc@google.com> 2020-08-14 16:32:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-14 16:32:21 +0000
commit26e004398fe6e7b00ab6fce74b128b6426492344 (patch)
tree189ed238fdb3c36fd7166ff845dcecb610ae3be8
parent9016cc88e3d2cf9de3d09dc1b4fde6054662a87d (diff)
parent7bbc03b4672693b998e91868fec276cbc97eeaf4 (diff)
Merge "Fix a TODO." am: 7bbc03b467
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399574 Change-Id: I58efe7c2f49d1c463026572c5eabad0f55c6a7e2
-rw-r--r--core/jni/com_android_internal_os_Zygote.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index b3c76f860cd2..8f14f7311acf 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -1248,8 +1248,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
#ifdef ANDROID_EXPERIMENTAL_MTE
SetTagCheckingLevel(PR_MTE_TCF_SYNC);
#endif
- // TODO(pcc): Use SYNC here once the allocator supports it.
- heap_tagging_level = M_HEAP_TAGGING_LEVEL_ASYNC;
+ heap_tagging_level = M_HEAP_TAGGING_LEVEL_SYNC;
break;
default:
#ifdef ANDROID_EXPERIMENTAL_MTE