diff options
| author | satayev <satayev@google.com> | 2021-02-22 17:24:48 +0000 |
|---|---|---|
| committer | satayev <satayev@google.com> | 2021-02-23 04:06:39 +0000 |
| commit | ff8c375e956e1cd00a8a0fc461e44bac6d3101a7 (patch) | |
| tree | cb8bdccbdcd3c252837581346da388b1ff18fcb4 /core/java | |
| parent | bff33b8c31b42dff8d4d7164e68858ef16cabc86 (diff) | |
Revert "Do not propogate test api access flags to Zygote."
This reverts commit bff33b8c31b42dff8d4d7164e68858ef16cabc86.
Reason for revert: cts tests on -user builds is broken
Change-Id: I2edf200561f839e49e067403714ea6fa65bdc978
Merged-In: I2edf200561f839e49e067403714ea6fa65bdc978
Diffstat (limited to 'core/java')
| -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 527d10f0d00a..0381a75d722b 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. |