diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-24 02:20:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-24 02:20:37 +0000 |
| commit | 6faddabeb7c80744694f59136a5189d4c0464df9 (patch) | |
| tree | 75224abd0c288ccd6a4fd1854393f242c52109ce /core/java/com | |
| parent | ce2d40870e16005103d7ad528760bf0039cad478 (diff) | |
| parent | ff8c375e956e1cd00a8a0fc461e44bac6d3101a7 (diff) | |
Merge "Revert "Do not propogate test api access flags to Zygote.""
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/os/Zygote.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 65beb9360241..408e591b6336 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -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. |