Merge "Revert "Do not propogate test api access flags to Zygote."" am: 6faddabeb7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd5c0eea7f0e595dc3f65ccfb20e7f6797280c0d
This commit is contained in:
Treehugger Robot
2021-02-24 03:00:41 +00:00
committed by Automerger Merge Worker
3 changed files with 31 additions and 9 deletions

View File

@@ -103,7 +103,7 @@ public final class Zygote {
*/
public static final int PROFILE_FROM_SHELL = 1 << 15;
/**
/*
* Enable using the ART app image startup cache
*/
public static final int USE_APP_IMAGE_STARTUP_CACHE = 1 << 16;
@@ -116,6 +116,13 @@ public final class Zygote {
*/
public static final int DEBUG_IGNORE_APP_SIGNAL_HANDLER = 1 << 17;
/**
* Disable runtime access to {@link android.annotation.TestApi} annotated members.
*
* <p>This only takes effect if Hidden API access restrictions are enabled as well.
*/
public static final int DISABLE_TEST_API_ENFORCEMENT_POLICY = 1 << 18;
public static final int MEMORY_TAG_LEVEL_MASK = (1 << 19) | (1 << 20);
/**
* Enable pointer tagging in this process.