Merge "Allow the kernel to upgrade ASYNC mode processes to SYNC mode." am: fc2745ae54 am: 791e6e8bfc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1754778 Change-Id: I97bb4231b8cb7608750a47c196b65fa18b60dcb4
2021-07-02 18:27:26 +00:00
parent 60157279d6 791e6e8bfc
commit 3afa9fae1a
1 changed files with 1 additions and 0 deletions
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -2602,6 +2602,7 @@ static jint com_android_internal_os_Zygote_nativeCurrentTaggingLevel(JNIEnv* env
    case PR_MTE_TCF_SYNC:
      return MEMORY_TAG_LEVEL_SYNC;
    case PR_MTE_TCF_ASYNC:
+    case PR_MTE_TCF_ASYNC | PR_MTE_TCF_SYNC:
      return MEMORY_TAG_LEVEL_ASYNC;
    default:
      ALOGE("Unknown memory tagging level: %i", level);