Added greylist-max-r

This commit is contained in:
Danny 2022-01-10 12:45:01 -07:00 committed by Ben Gruver
parent cbd41d36cc
commit ec5ae22888
6 changed files with 17 additions and 4 deletions

View File

@ -39,3 +39,7 @@
return-void return-void
.end method .end method
.method private greylist-max-r greylistMaxR()V
.registers 1
return-void
.end method

View File

@ -33,6 +33,11 @@
return-void return-void
.end method .end method
.method private greylist-max-r greylistMaxR()V
.registers 1
return-void
.end method
.method private greylist-max-q core-platform-api test-api testAndCorePlatformApiMethod()V .method private greylist-max-q core-platform-api test-api testAndCorePlatformApiMethod()V
.registers 1 .registers 1
return-void return-void

View File

@ -46,6 +46,7 @@ public enum HiddenApiRestriction {
GREYLIST_MAX_O(3, "greylist-max-o", false), GREYLIST_MAX_O(3, "greylist-max-o", false),
GREYLIST_MAX_P(4, "greylist-max-p", false), GREYLIST_MAX_P(4, "greylist-max-p", false),
GREYLIST_MAX_Q(5, "greylist-max-q", false), GREYLIST_MAX_Q(5, "greylist-max-q", false),
GREYLIST_MAX_R(6, "greylist-max-r", false),
CORE_PLATFORM_API(8, "core-platform-api", true), CORE_PLATFORM_API(8, "core-platform-api", true),
TEST_API(16, "test-api", true); TEST_API(16, "test-api", true);
@ -55,7 +56,8 @@ public enum HiddenApiRestriction {
BLACKLIST, BLACKLIST,
GREYLIST_MAX_O, GREYLIST_MAX_O,
GREYLIST_MAX_P, GREYLIST_MAX_P,
GREYLIST_MAX_Q GREYLIST_MAX_Q,
GREYLIST_MAX_R
}; };
private static final HiddenApiRestriction[] domainSpecificApiFlags = new HiddenApiRestriction[] { private static final HiddenApiRestriction[] domainSpecificApiFlags = new HiddenApiRestriction[] {

View File

@ -479,7 +479,7 @@ Type = {PrimitiveType} | {ClassDescriptor} | {ArrayPrefix} ({ClassDescriptor} |
return newToken(ACCESS_SPEC); return newToken(ACCESS_SPEC);
} }
"whitelist" | "greylist" | "blacklist" | "greylist-max-o" | "greylist-max-p" | "greylist-max-q" | "whitelist" | "greylist" | "blacklist" | "greylist-max-o" | "greylist-max-p" | "greylist-max-q" | "greylist-max-r" |
"core-platform-api" | "test-api" { "core-platform-api" | "test-api" {
return newToken(HIDDENAPI_RESTRICTION); return newToken(HIDDENAPI_RESTRICTION);
} }

View File

@ -40,6 +40,7 @@ blacklist
greylist-max-o greylist-max-o
greylist-max-p greylist-max-p
greylist-max-q greylist-max-q
greylist-max-r
core-platform-api core-platform-api
test-api test-api
@ -94,4 +95,4 @@ field@abcd
+1234 +1234
+08 +08
+ +

View File

@ -40,6 +40,7 @@ HIDDENAPI_RESTRICTION("blacklist")
HIDDENAPI_RESTRICTION("greylist-max-o") HIDDENAPI_RESTRICTION("greylist-max-o")
HIDDENAPI_RESTRICTION("greylist-max-p") HIDDENAPI_RESTRICTION("greylist-max-p")
HIDDENAPI_RESTRICTION("greylist-max-q") HIDDENAPI_RESTRICTION("greylist-max-q")
HIDDENAPI_RESTRICTION("greylist-max-r")
HIDDENAPI_RESTRICTION("core-platform-api") HIDDENAPI_RESTRICTION("core-platform-api")
HIDDENAPI_RESTRICTION("test-api") HIDDENAPI_RESTRICTION("test-api")
@ -94,4 +95,4 @@ INVALID_TOKEN("+") POSITIVE_INTEGER_LITERAL("0x1234ABC")
INVALID_TOKEN("+") POSITIVE_INTEGER_LITERAL("1234") INVALID_TOKEN("+") POSITIVE_INTEGER_LITERAL("1234")
INVALID_TOKEN("+") SIMPLE_NAME("08") INVALID_TOKEN("+") SIMPLE_NAME("08")
INVALID_TOKEN("+") INVALID_TOKEN("+")