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

Commit 40a71c83 authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Automerger Merge Worker
Browse files

Merge "Fix a TODO." am: 7bbc03b4 am: 26e00439 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399574

Change-Id: I55ce7a0b31564b0e6859e974bef95cc60f43e7d8
parents fbeb17c9 26e00439

core/jni/com_android_internal_os_Zygote.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -1800,8 +1800,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, 
#ifdef ANDROID_EXPERIMENTAL_MTE

#ifdef ANDROID_EXPERIMENTAL_MTE

      SetTagCheckingLevel(PR_MTE_TCF_SYNC);

      SetTagCheckingLevel(PR_MTE_TCF_SYNC);

#endif

#endif

      // TODO(pcc): Use SYNC here once the allocator supports it.

      heap_tagging_level = M_HEAP_TAGGING_LEVEL_SYNC;

      heap_tagging_level = M_HEAP_TAGGING_LEVEL_ASYNC;

      break;

      break;

    default:

    default:

#ifdef ANDROID_EXPERIMENTAL_MTE

#ifdef ANDROID_EXPERIMENTAL_MTE