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

Commit 19a216d5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Switch the zygote over to mallopt(M_BIONIC_SET_HEAP_TAGGING_LEVEL)."... 

Merge "Switch the zygote over to mallopt(M_BIONIC_SET_HEAP_TAGGING_LEVEL)." am: 2ccc6dfb am: 4a7fecb6 am: d5954392

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a69b7ca4bfb7c9cbd3380f7be3d41882502b3f5
parents 6e022dc0 d5954392

core/jni/com_android_internal_os_Zygote.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1784,7 +1784,7 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, 
      heap_tagging_level = M_HEAP_TAGGING_LEVEL_NONE;

      break;

  }

  android_mallopt(M_SET_HEAP_TAGGING_LEVEL, &heap_tagging_level, sizeof(heap_tagging_level));

  mallopt(M_BIONIC_SET_HEAP_TAGGING_LEVEL, heap_tagging_level);

  // Now that we've used the flag, clear it so that we don't pass unknown flags to the ART runtime.

  runtime_flags &= ~RuntimeFlags::MEMORY_TAG_LEVEL_MASK;