summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoratrost <atrost@google.com>2020-02-25 20:10:00 +0000
committeratrost <atrost@google.com>2020-02-28 14:33:49 +0000
commitf285371e04b5b1c85bef00e64cffd4fb855601ab (patch)
tree9e9e34d1f730421415cf6ecaa8aee7748371744a
parent79a219edf2d6cd697059cf5bf7310de9c68a89e5 (diff)
Add change ids to gate greylist-max-p, greylist-max-q
This will allow toggling access to APIs that are in greylist-max-p and greylist-max-q (two separate toggles). Bug: 149994052 Bug: 149997251 Test: mma test-art-host-gtest-hidden_api_test64 Test: adb shell dumpsys platform_compat Change-Id: I21d7a37a35cad8ec638d9c33dea27e75752324eb Merged-In: I21d7a37a35cad8ec638d9c33dea27e75752324eb
-rw-r--r--libart/src/main/java/dalvik/system/VMRuntime.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index 863f85d4e6..970dcc2868 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -73,6 +73,20 @@ public final class VMRuntime {
PREVENT_META_REFLECTION_BLACKLIST_ACCESS = 142365358; // This is a bug id.
/**
+ * Gating access to greylist-max-p APIs.
+ */
+ @ChangeId
+ @EnabledAfter(targetSdkVersion = VersionCodes.P)
+ private static final long HIDE_MAXTARGETSDK_P_HIDDEN_APIS = 149997251; // This is a bug id.
+
+ /**
+ * Gating access to greylist-max-q APIs.
+ */
+ @ChangeId
+ @EnabledAfter(targetSdkVersion = VersionCodes.Q)
+ private static final long HIDE_MAXTARGETSDK_Q_HIDDEN_APIS = 149994052; // This is a bug id.
+
+ /**
* Interface for logging hidden API usage events.
*/
@libcore.api.CorePlatformApi