Rename classes in art hiddenapi tests
Use more inclusive terminology (go/hiddenapi-list-renaming).
Bug: 162500436
Test: art/test/testrunner/testrunner.py --target --64 -t 674-hiddenapi
Test: art/test/testrunner/testrunner.py --target --64 -t 999-redefine-hiddenapi
Change-Id: I9a5139b04196187cbb063c9d122047a8fbc455ce
diff --git a/test/674-hiddenapi/hiddenapi-flags.csv b/test/674-hiddenapi/hiddenapi-flags.csv
index 1596f14..0eb17ef 100644
--- a/test/674-hiddenapi/hiddenapi-flags.csv
+++ b/test/674-hiddenapi/hiddenapi-flags.csv
@@ -1,47 +1,47 @@
-LNullaryConstructorBlacklistAndCorePlatformApi;-><init>()V,blocked,core-platform-api
-LNullaryConstructorBlacklist;-><init>()V,blocked
-LNullaryConstructorDarkGreylist;-><init>()V,max-target-o
-LNullaryConstructorLightGreylist;-><init>()V,unsupported
-LParentClass;->fieldPackageBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldPackageBlacklist:I,blocked
-LParentClass;->fieldPackageDarkGreylist:I,max-target-o
-LParentClass;->fieldPackageLightGreylist:I,unsupported
-LParentClass;->fieldPackageStaticBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldPackageStaticBlacklist:I,blocked
-LParentClass;->fieldPackageStaticDarkGreylist:I,max-target-o
-LParentClass;->fieldPackageStaticLightGreylist:I,unsupported
-LParentClass;->fieldPrivateBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldPrivateBlacklist:I,blocked
-LParentClass;->fieldPrivateDarkGreylist:I,max-target-o
-LParentClass;->fieldPrivateLightGreylist:I,unsupported
-LParentClass;->fieldPrivateStaticBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldPrivateStaticBlacklist:I,blocked
-LParentClass;->fieldPrivateStaticDarkGreylist:I,max-target-o
-LParentClass;->fieldPrivateStaticLightGreylist:I,unsupported
-LParentClass;->fieldProtectedBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldProtectedBlacklist:I,blocked
-LParentClass;->fieldProtectedDarkGreylist:I,max-target-o
-LParentClass;->fieldProtectedLightGreylist:I,unsupported
-LParentClass;->fieldProtectedStaticBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldProtectedStaticBlacklist:I,blocked
-LParentClass;->fieldProtectedStaticDarkGreylist:I,max-target-o
-LParentClass;->fieldProtectedStaticLightGreylist:I,unsupported
-LParentClass;->fieldPublicBlacklistAndCorePlatformApiB:I,blocked,core-platform-api
-LParentClass;->fieldPublicBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldPublicBlacklistB:I,blocked
-LParentClass;->fieldPublicBlacklist:I,blocked
-LParentClass;->fieldPublicDarkGreylistB:I,max-target-o
-LParentClass;->fieldPublicDarkGreylist:I,max-target-o
-LParentClass;->fieldPublicLightGreylistB:I,unsupported
-LParentClass;->fieldPublicLightGreylist:I,unsupported
-LParentClass;->fieldPublicStaticBlacklistAndCorePlatformApiB:I,blocked,core-platform-api
-LParentClass;->fieldPublicStaticBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentClass;->fieldPublicStaticBlacklistB:I,blocked
-LParentClass;->fieldPublicStaticBlacklist:I,blocked
-LParentClass;->fieldPublicStaticDarkGreylistB:I,max-target-o
-LParentClass;->fieldPublicStaticDarkGreylist:I,max-target-o
-LParentClass;->fieldPublicStaticLightGreylistB:I,unsupported
-LParentClass;->fieldPublicStaticLightGreylist:I,unsupported
+LNullaryConstructorBlocklistAndCorePlatformApi;-><init>()V,blocked,core-platform-api
+LNullaryConstructorBlocklist;-><init>()V,blocked
+LNullaryConstructorConditionallyBlocked;-><init>()V,max-target-o
+LNullaryConstructorUnsupported;-><init>()V,unsupported
+LParentClass;->fieldPackageBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldPackageBlocklist:I,blocked
+LParentClass;->fieldPackageConditionallyBlocked:I,max-target-o
+LParentClass;->fieldPackageUnsupported:I,unsupported
+LParentClass;->fieldPackageStaticBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldPackageStaticBlocklist:I,blocked
+LParentClass;->fieldPackageStaticConditionallyBlocked:I,max-target-o
+LParentClass;->fieldPackageStaticUnsupported:I,unsupported
+LParentClass;->fieldPrivateBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldPrivateBlocklist:I,blocked
+LParentClass;->fieldPrivateConditionallyBlocked:I,max-target-o
+LParentClass;->fieldPrivateUnsupported:I,unsupported
+LParentClass;->fieldPrivateStaticBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldPrivateStaticBlocklist:I,blocked
+LParentClass;->fieldPrivateStaticConditionallyBlocked:I,max-target-o
+LParentClass;->fieldPrivateStaticUnsupported:I,unsupported
+LParentClass;->fieldProtectedBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldProtectedBlocklist:I,blocked
+LParentClass;->fieldProtectedConditionallyBlocked:I,max-target-o
+LParentClass;->fieldProtectedUnsupported:I,unsupported
+LParentClass;->fieldProtectedStaticBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldProtectedStaticBlocklist:I,blocked
+LParentClass;->fieldProtectedStaticConditionallyBlocked:I,max-target-o
+LParentClass;->fieldProtectedStaticUnsupported:I,unsupported
+LParentClass;->fieldPublicBlocklistAndCorePlatformApiB:I,blocked,core-platform-api
+LParentClass;->fieldPublicBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldPublicBlocklistB:I,blocked
+LParentClass;->fieldPublicBlocklist:I,blocked
+LParentClass;->fieldPublicConditionallyBlockedB:I,max-target-o
+LParentClass;->fieldPublicConditionallyBlocked:I,max-target-o
+LParentClass;->fieldPublicUnsupportedB:I,unsupported
+LParentClass;->fieldPublicUnsupported:I,unsupported
+LParentClass;->fieldPublicStaticBlocklistAndCorePlatformApiB:I,blocked,core-platform-api
+LParentClass;->fieldPublicStaticBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentClass;->fieldPublicStaticBlocklistB:I,blocked
+LParentClass;->fieldPublicStaticBlocklist:I,blocked
+LParentClass;->fieldPublicStaticConditionallyBlockedB:I,max-target-o
+LParentClass;->fieldPublicStaticConditionallyBlocked:I,max-target-o
+LParentClass;->fieldPublicStaticUnsupportedB:I,unsupported
+LParentClass;->fieldPublicStaticUnsupported:I,unsupported
LParentClass;-><init>(DB)V,max-target-o
LParentClass;-><init>(DC)V,blocked
LParentClass;-><init>(DI)V,blocked,core-platform-api
@@ -58,51 +58,51 @@
LParentClass;-><init>(JC)V,blocked
LParentClass;-><init>(JI)V,blocked,core-platform-api
LParentClass;-><init>(JZ)V,unsupported
-LParentClass;->methodPackageBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodPackageBlacklist()I,blocked
-LParentClass;->methodPackageDarkGreylist()I,max-target-o
-LParentClass;->methodPackageLightGreylist()I,unsupported
-LParentClass;->methodPackageStaticBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodPackageStaticBlacklist()I,blocked
-LParentClass;->methodPackageStaticDarkGreylist()I,max-target-o
-LParentClass;->methodPackageStaticLightGreylist()I,unsupported
-LParentClass;->methodPrivateBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodPrivateBlacklist()I,blocked
-LParentClass;->methodPrivateDarkGreylist()I,max-target-o
-LParentClass;->methodPrivateLightGreylist()I,unsupported
-LParentClass;->methodPrivateStaticBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodPrivateStaticBlacklist()I,blocked
-LParentClass;->methodPrivateStaticDarkGreylist()I,max-target-o
-LParentClass;->methodPrivateStaticLightGreylist()I,unsupported
-LParentClass;->methodProtectedBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodProtectedBlacklist()I,blocked
-LParentClass;->methodProtectedDarkGreylist()I,max-target-o
-LParentClass;->methodProtectedLightGreylist()I,unsupported
-LParentClass;->methodProtectedStaticBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodProtectedStaticBlacklist()I,blocked
-LParentClass;->methodProtectedStaticDarkGreylist()I,max-target-o
-LParentClass;->methodProtectedStaticLightGreylist()I,unsupported
-LParentClass;->methodPublicBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodPublicBlacklist()I,blocked
-LParentClass;->methodPublicDarkGreylist()I,max-target-o
-LParentClass;->methodPublicLightGreylist()I,unsupported
-LParentClass;->methodPublicStaticBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentClass;->methodPublicStaticBlacklist()I,blocked
-LParentClass;->methodPublicStaticDarkGreylist()I,max-target-o
-LParentClass;->methodPublicStaticLightGreylist()I,unsupported
-LParentInterface;->fieldPublicStaticBlacklistAndCorePlatformApi:I,blocked,core-platform-api
-LParentInterface;->fieldPublicStaticBlacklist:I,blocked
-LParentInterface;->fieldPublicStaticDarkGreylist:I,max-target-o
-LParentInterface;->fieldPublicStaticLightGreylist:I,unsupported
-LParentInterface;->methodPublicBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentInterface;->methodPublicBlacklist()I,blocked
-LParentInterface;->methodPublicDarkGreylist()I,max-target-o
-LParentInterface;->methodPublicDefaultBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentInterface;->methodPublicDefaultBlacklist()I,blocked
-LParentInterface;->methodPublicDefaultDarkGreylist()I,max-target-o
-LParentInterface;->methodPublicDefaultLightGreylist()I,unsupported
-LParentInterface;->methodPublicLightGreylist()I,unsupported
-LParentInterface;->methodPublicStaticBlacklistAndCorePlatformApi()I,blocked,core-platform-api
-LParentInterface;->methodPublicStaticBlacklist()I,blocked
-LParentInterface;->methodPublicStaticDarkGreylist()I,max-target-o
-LParentInterface;->methodPublicStaticLightGreylist()I,unsupported
+LParentClass;->methodPackageBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodPackageBlocklist()I,blocked
+LParentClass;->methodPackageConditionallyBlocked()I,max-target-o
+LParentClass;->methodPackageUnsupported()I,unsupported
+LParentClass;->methodPackageStaticBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodPackageStaticBlocklist()I,blocked
+LParentClass;->methodPackageStaticConditionallyBlocked()I,max-target-o
+LParentClass;->methodPackageStaticUnsupported()I,unsupported
+LParentClass;->methodPrivateBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodPrivateBlocklist()I,blocked
+LParentClass;->methodPrivateConditionallyBlocked()I,max-target-o
+LParentClass;->methodPrivateUnsupported()I,unsupported
+LParentClass;->methodPrivateStaticBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodPrivateStaticBlocklist()I,blocked
+LParentClass;->methodPrivateStaticConditionallyBlocked()I,max-target-o
+LParentClass;->methodPrivateStaticUnsupported()I,unsupported
+LParentClass;->methodProtectedBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodProtectedBlocklist()I,blocked
+LParentClass;->methodProtectedConditionallyBlocked()I,max-target-o
+LParentClass;->methodProtectedUnsupported()I,unsupported
+LParentClass;->methodProtectedStaticBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodProtectedStaticBlocklist()I,blocked
+LParentClass;->methodProtectedStaticConditionallyBlocked()I,max-target-o
+LParentClass;->methodProtectedStaticUnsupported()I,unsupported
+LParentClass;->methodPublicBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodPublicBlocklist()I,blocked
+LParentClass;->methodPublicConditionallyBlocked()I,max-target-o
+LParentClass;->methodPublicUnsupported()I,unsupported
+LParentClass;->methodPublicStaticBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentClass;->methodPublicStaticBlocklist()I,blocked
+LParentClass;->methodPublicStaticConditionallyBlocked()I,max-target-o
+LParentClass;->methodPublicStaticUnsupported()I,unsupported
+LParentInterface;->fieldPublicStaticBlocklistAndCorePlatformApi:I,blocked,core-platform-api
+LParentInterface;->fieldPublicStaticBlocklist:I,blocked
+LParentInterface;->fieldPublicStaticConditionallyBlocked:I,max-target-o
+LParentInterface;->fieldPublicStaticUnsupported:I,unsupported
+LParentInterface;->methodPublicBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentInterface;->methodPublicBlocklist()I,blocked
+LParentInterface;->methodPublicConditionallyBlocked()I,max-target-o
+LParentInterface;->methodPublicDefaultBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentInterface;->methodPublicDefaultBlocklist()I,blocked
+LParentInterface;->methodPublicDefaultConditionallyBlocked()I,max-target-o
+LParentInterface;->methodPublicDefaultUnsupported()I,unsupported
+LParentInterface;->methodPublicUnsupported()I,unsupported
+LParentInterface;->methodPublicStaticBlocklistAndCorePlatformApi()I,blocked,core-platform-api
+LParentInterface;->methodPublicStaticBlocklist()I,blocked
+LParentInterface;->methodPublicStaticConditionallyBlocked()I,max-target-o
+LParentInterface;->methodPublicStaticUnsupported()I,unsupported
diff --git a/test/674-hiddenapi/src-ex/ChildClass.java b/test/674-hiddenapi/src-ex/ChildClass.java
index 855134b..128d701 100644
--- a/test/674-hiddenapi/src-ex/ChildClass.java
+++ b/test/674-hiddenapi/src-ex/ChildClass.java
@@ -42,11 +42,11 @@
}
enum Hiddenness {
- Whitelist(PrimitiveType.TShort),
- LightGreylist(PrimitiveType.TBoolean),
- DarkGreylist(PrimitiveType.TByte),
- Blacklist(PrimitiveType.TCharacter),
- BlacklistAndCorePlatformApi(PrimitiveType.TInteger);
+ Sdk(PrimitiveType.TShort),
+ Unsupported(PrimitiveType.TBoolean),
+ ConditionallyBlocked(PrimitiveType.TByte),
+ Blocklist(PrimitiveType.TCharacter),
+ BlocklistAndCorePlatformApi(PrimitiveType.TInteger);
Hiddenness(PrimitiveType type) { mAssociatedType = type; }
public PrimitiveType mAssociatedType;
@@ -78,14 +78,14 @@
private static final boolean booleanValues[] = new boolean[] { false, true };
public static void runTest(String libFileName, int parentDomainOrdinal,
- int childDomainOrdinal, boolean everythingWhitelisted) throws Exception {
+ int childDomainOrdinal, boolean everythingSdked) throws Exception {
System.load(libFileName);
parentDomain = DexDomain.values()[parentDomainOrdinal];
childDomain = DexDomain.values()[childDomainOrdinal];
configMessage = "parentDomain=" + parentDomain.name() + ", childDomain=" + childDomain.name()
- + ", everythingWhitelisted=" + everythingWhitelisted;
+ + ", everythingSdked=" + everythingSdked;
// Check expectations about loading into boot class path.
boolean isParentInBoot = (ParentClass.class.getClassLoader().getParent() == null);
@@ -100,7 +100,7 @@
throw new RuntimeException("Expected ChildClass " + (expectedChildInBoot ? "" : "not ") +
"in boot class path");
}
- ChildClass.everythingWhitelisted = everythingWhitelisted;
+ ChildClass.everythingSdked = everythingSdked;
boolean isSameBoot = (isParentInBoot == isChildInBoot);
@@ -117,18 +117,18 @@
final boolean invokesMemberCallback;
// Warnings are now disabled whenever access is granted, even for
// greylisted APIs. This is the behaviour for release builds.
- if (everythingWhitelisted || hiddenness == Hiddenness.Whitelist) {
+ if (everythingSdked || hiddenness == Hiddenness.Sdk) {
expected = Behaviour.Granted;
invokesMemberCallback = false;
} else if (parentDomain == DexDomain.CorePlatform && childDomain == DexDomain.Platform) {
- expected = (hiddenness == Hiddenness.BlacklistAndCorePlatformApi)
+ expected = (hiddenness == Hiddenness.BlocklistAndCorePlatformApi)
? Behaviour.Granted : Behaviour.Denied;
invokesMemberCallback = false;
} else if (isSameBoot) {
expected = Behaviour.Granted;
invokesMemberCallback = false;
- } else if (hiddenness == Hiddenness.Blacklist ||
- hiddenness == Hiddenness.BlacklistAndCorePlatformApi) {
+ } else if (hiddenness == Hiddenness.Blocklist ||
+ hiddenness == Hiddenness.BlocklistAndCorePlatformApi) {
expected = Behaviour.Denied;
invokesMemberCallback = true;
} else {
@@ -551,7 +551,7 @@
private static DexDomain parentDomain;
private static DexDomain childDomain;
- private static boolean everythingWhitelisted;
+ private static boolean everythingSdked;
private static String configMessage;
}
diff --git a/test/674-hiddenapi/src-ex/Linking.java b/test/674-hiddenapi/src-ex/Linking.java
index 06f035f..a370d14 100644
--- a/test/674-hiddenapi/src-ex/Linking.java
+++ b/test/674-hiddenapi/src-ex/Linking.java
@@ -38,266 +38,266 @@
// INSTANCE FIELD GET
-class LinkFieldGetWhitelist {
+class LinkFieldGetSdk {
public static int access() {
- return new ParentClass().fieldPublicWhitelist;
+ return new ParentClass().fieldPublicSdk;
}
}
-class LinkFieldGetLightGreylist {
+class LinkFieldGetUnsupported {
public static int access() {
- return new ParentClass().fieldPublicLightGreylist;
+ return new ParentClass().fieldPublicUnsupported;
}
}
-class LinkFieldGetDarkGreylist {
+class LinkFieldGetConditionallyBlocked {
public static int access() {
- return new ParentClass().fieldPublicDarkGreylist;
+ return new ParentClass().fieldPublicConditionallyBlocked;
}
}
-class LinkFieldGetBlacklist {
+class LinkFieldGetBlocklist {
public static int access() {
- return new ParentClass().fieldPublicBlacklist;
+ return new ParentClass().fieldPublicBlocklist;
}
}
-class LinkFieldGetBlacklistAndCorePlatformApi {
+class LinkFieldGetBlocklistAndCorePlatformApi {
public static int access() {
- return new ParentClass().fieldPublicBlacklistAndCorePlatformApi;
+ return new ParentClass().fieldPublicBlocklistAndCorePlatformApi;
}
}
// INSTANCE FIELD SET
-class LinkFieldSetWhitelist {
+class LinkFieldSetSdk {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- new ParentClass().fieldPublicWhitelistB = x;
+ new ParentClass().fieldPublicSdkB = x;
}
}
-class LinkFieldSetLightGreylist {
+class LinkFieldSetUnsupported {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- new ParentClass().fieldPublicLightGreylistB = x;
+ new ParentClass().fieldPublicUnsupportedB = x;
}
}
-class LinkFieldSetDarkGreylist {
+class LinkFieldSetConditionallyBlocked {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- new ParentClass().fieldPublicDarkGreylistB = x;
+ new ParentClass().fieldPublicConditionallyBlockedB = x;
}
}
-class LinkFieldSetBlacklist {
+class LinkFieldSetBlocklist {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- new ParentClass().fieldPublicBlacklistB = x;
+ new ParentClass().fieldPublicBlocklistB = x;
}
}
-class LinkFieldSetBlacklistAndCorePlatformApi {
+class LinkFieldSetBlocklistAndCorePlatformApi {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- new ParentClass().fieldPublicBlacklistAndCorePlatformApiB = x;
+ new ParentClass().fieldPublicBlocklistAndCorePlatformApiB = x;
}
}
// STATIC FIELD GET
-class LinkFieldGetStaticWhitelist {
+class LinkFieldGetStaticSdk {
public static int access() {
- return ParentClass.fieldPublicStaticWhitelist;
+ return ParentClass.fieldPublicStaticSdk;
}
}
-class LinkFieldGetStaticLightGreylist {
+class LinkFieldGetStaticUnsupported {
public static int access() {
- return ParentClass.fieldPublicStaticLightGreylist;
+ return ParentClass.fieldPublicStaticUnsupported;
}
}
-class LinkFieldGetStaticDarkGreylist {
+class LinkFieldGetStaticConditionallyBlocked {
public static int access() {
- return ParentClass.fieldPublicStaticDarkGreylist;
+ return ParentClass.fieldPublicStaticConditionallyBlocked;
}
}
-class LinkFieldGetStaticBlacklist {
+class LinkFieldGetStaticBlocklist {
public static int access() {
- return ParentClass.fieldPublicStaticBlacklist;
+ return ParentClass.fieldPublicStaticBlocklist;
}
}
-class LinkFieldGetStaticBlacklistAndCorePlatformApi {
+class LinkFieldGetStaticBlocklistAndCorePlatformApi {
public static int access() {
- return ParentClass.fieldPublicStaticBlacklistAndCorePlatformApi;
+ return ParentClass.fieldPublicStaticBlocklistAndCorePlatformApi;
}
}
// STATIC FIELD SET
-class LinkFieldSetStaticWhitelist {
+class LinkFieldSetStaticSdk {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- ParentClass.fieldPublicStaticWhitelistB = x;
+ ParentClass.fieldPublicStaticSdkB = x;
}
}
-class LinkFieldSetStaticLightGreylist {
+class LinkFieldSetStaticUnsupported {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- ParentClass.fieldPublicStaticLightGreylistB = x;
+ ParentClass.fieldPublicStaticUnsupportedB = x;
}
}
-class LinkFieldSetStaticDarkGreylist {
+class LinkFieldSetStaticConditionallyBlocked {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- ParentClass.fieldPublicStaticDarkGreylistB = x;
+ ParentClass.fieldPublicStaticConditionallyBlockedB = x;
}
}
-class LinkFieldSetStaticBlacklist {
+class LinkFieldSetStaticBlocklist {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- ParentClass.fieldPublicStaticBlacklistB = x;
+ ParentClass.fieldPublicStaticBlocklistB = x;
}
}
-class LinkFieldSetStaticBlacklistAndCorePlatformApi {
+class LinkFieldSetStaticBlocklistAndCorePlatformApi {
public static void access(int x) {
// Need to use a different field from the getter to bypass DexCache.
- ParentClass.fieldPublicStaticBlacklistAndCorePlatformApiB = x;
+ ParentClass.fieldPublicStaticBlocklistAndCorePlatformApiB = x;
}
}
// INVOKE INSTANCE METHOD
-class LinkMethodWhitelist {
+class LinkMethodSdk {
public static int access() {
- return new ParentClass().methodPublicWhitelist();
+ return new ParentClass().methodPublicSdk();
}
}
-class LinkMethodLightGreylist {
+class LinkMethodUnsupported {
public static int access() {
- return new ParentClass().methodPublicLightGreylist();
+ return new ParentClass().methodPublicUnsupported();
}
}
-class LinkMethodDarkGreylist {
+class LinkMethodConditionallyBlocked {
public static int access() {
- return new ParentClass().methodPublicDarkGreylist();
+ return new ParentClass().methodPublicConditionallyBlocked();
}
}
-class LinkMethodBlacklist {
+class LinkMethodBlocklist {
public static int access() {
- return new ParentClass().methodPublicBlacklist();
+ return new ParentClass().methodPublicBlocklist();
}
}
-class LinkMethodBlacklistAndCorePlatformApi {
+class LinkMethodBlocklistAndCorePlatformApi {
public static int access() {
- return new ParentClass().methodPublicBlacklistAndCorePlatformApi();
+ return new ParentClass().methodPublicBlocklistAndCorePlatformApi();
}
}
// INVOKE INSTANCE INTERFACE METHOD
-class LinkMethodInterfaceWhitelist {
+class LinkMethodInterfaceSdk {
public static int access() {
- return SampleClass.getInterfaceInstance().methodPublicWhitelist();
+ return SampleClass.getInterfaceInstance().methodPublicSdk();
}
}
-class LinkMethodInterfaceLightGreylist {
+class LinkMethodInterfaceUnsupported {
public static int access() {
- return SampleClass.getInterfaceInstance().methodPublicLightGreylist();
+ return SampleClass.getInterfaceInstance().methodPublicUnsupported();
}
}
-class LinkMethodInterfaceDarkGreylist {
+class LinkMethodInterfaceConditionallyBlocked {
public static int access() {
- return SampleClass.getInterfaceInstance().methodPublicDarkGreylist();
+ return SampleClass.getInterfaceInstance().methodPublicConditionallyBlocked();
}
}
-class LinkMethodInterfaceBlacklist {
+class LinkMethodInterfaceBlocklist {
public static int access() {
- return SampleClass.getInterfaceInstance().methodPublicBlacklist();
+ return SampleClass.getInterfaceInstance().methodPublicBlocklist();
}
}
-class LinkMethodInterfaceBlacklistAndCorePlatformApi {
+class LinkMethodInterfaceBlocklistAndCorePlatformApi {
public static int access() {
- return SampleClass.getInterfaceInstance().methodPublicBlacklistAndCorePlatformApi();
+ return SampleClass.getInterfaceInstance().methodPublicBlocklistAndCorePlatformApi();
}
}
// INVOKE STATIC METHOD
-class LinkMethodStaticWhitelist {
+class LinkMethodStaticSdk {
public static int access() {
- return ParentClass.methodPublicStaticWhitelist();
+ return ParentClass.methodPublicStaticSdk();
}
}
-class LinkMethodStaticLightGreylist {
+class LinkMethodStaticUnsupported {
public static int access() {
- return ParentClass.methodPublicStaticLightGreylist();
+ return ParentClass.methodPublicStaticUnsupported();
}
}
-class LinkMethodStaticDarkGreylist {
+class LinkMethodStaticConditionallyBlocked {
public static int access() {
- return ParentClass.methodPublicStaticDarkGreylist();
+ return ParentClass.methodPublicStaticConditionallyBlocked();
}
}
-class LinkMethodStaticBlacklist {
+class LinkMethodStaticBlocklist {
public static int access() {
- return ParentClass.methodPublicStaticBlacklist();
+ return ParentClass.methodPublicStaticBlocklist();
}
}
-class LinkMethodStaticBlacklistAndCorePlatformApi {
+class LinkMethodStaticBlocklistAndCorePlatformApi {
public static int access() {
- return ParentClass.methodPublicStaticBlacklistAndCorePlatformApi();
+ return ParentClass.methodPublicStaticBlocklistAndCorePlatformApi();
}
}
// INVOKE INTERFACE STATIC METHOD
-class LinkMethodInterfaceStaticWhitelist {
+class LinkMethodInterfaceStaticSdk {
public static int access() {
- return ParentInterface.methodPublicStaticWhitelist();
+ return ParentInterface.methodPublicStaticSdk();
}
}
-class LinkMethodInterfaceStaticLightGreylist {
+class LinkMethodInterfaceStaticUnsupported {
public static int access() {
- return ParentInterface.methodPublicStaticLightGreylist();
+ return ParentInterface.methodPublicStaticUnsupported();
}
}
-class LinkMethodInterfaceStaticDarkGreylist {
+class LinkMethodInterfaceStaticConditionallyBlocked {
public static int access() {
- return ParentInterface.methodPublicStaticDarkGreylist();
+ return ParentInterface.methodPublicStaticConditionallyBlocked();
}
}
-class LinkMethodInterfaceStaticBlacklist {
+class LinkMethodInterfaceStaticBlocklist {
public static int access() {
- return ParentInterface.methodPublicStaticBlacklist();
+ return ParentInterface.methodPublicStaticBlocklist();
}
}
-class LinkMethodInterfaceStaticBlacklistAndCorePlatformApi {
+class LinkMethodInterfaceStaticBlocklistAndCorePlatformApi {
public static int access() {
- return ParentInterface.methodPublicStaticBlacklistAndCorePlatformApi();
+ return ParentInterface.methodPublicStaticBlocklistAndCorePlatformApi();
}
}
diff --git a/test/674-hiddenapi/src/NullaryConstructorBlacklist.java b/test/674-hiddenapi/src/NullaryConstructorBlocklist.java
similarity index 81%
rename from test/674-hiddenapi/src/NullaryConstructorBlacklist.java
rename to test/674-hiddenapi/src/NullaryConstructorBlocklist.java
index 5bf6278..62ec521 100644
--- a/test/674-hiddenapi/src/NullaryConstructorBlacklist.java
+++ b/test/674-hiddenapi/src/NullaryConstructorBlocklist.java
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-public class NullaryConstructorBlacklist {
- public NullaryConstructorBlacklist() { x = 22; }
- public NullaryConstructorBlacklist(int y) { x = y; }
+public class NullaryConstructorBlocklist {
+ public NullaryConstructorBlocklist() { x = 22; }
+ public NullaryConstructorBlocklist(int y) { x = y; }
protected int x;
}
diff --git a/test/674-hiddenapi/src/NullaryConstructorBlacklistAndCorePlatformApi.java b/test/674-hiddenapi/src/NullaryConstructorBlocklistAndCorePlatformApi.java
similarity index 77%
rename from test/674-hiddenapi/src/NullaryConstructorBlacklistAndCorePlatformApi.java
rename to test/674-hiddenapi/src/NullaryConstructorBlocklistAndCorePlatformApi.java
index 86af29e..4e993f5 100644
--- a/test/674-hiddenapi/src/NullaryConstructorBlacklistAndCorePlatformApi.java
+++ b/test/674-hiddenapi/src/NullaryConstructorBlocklistAndCorePlatformApi.java
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-public class NullaryConstructorBlacklistAndCorePlatformApi {
- public NullaryConstructorBlacklistAndCorePlatformApi() { x = 22; }
- public NullaryConstructorBlacklistAndCorePlatformApi(int y) { x = y; }
+public class NullaryConstructorBlocklistAndCorePlatformApi {
+ public NullaryConstructorBlocklistAndCorePlatformApi() { x = 22; }
+ public NullaryConstructorBlocklistAndCorePlatformApi(int y) { x = y; }
protected int x;
}
diff --git a/test/674-hiddenapi/src/NullaryConstructorWhitelist.java b/test/674-hiddenapi/src/NullaryConstructorConditionallyBlocked.java
similarity index 77%
copy from test/674-hiddenapi/src/NullaryConstructorWhitelist.java
copy to test/674-hiddenapi/src/NullaryConstructorConditionallyBlocked.java
index d101907..e80fe9b 100644
--- a/test/674-hiddenapi/src/NullaryConstructorWhitelist.java
+++ b/test/674-hiddenapi/src/NullaryConstructorConditionallyBlocked.java
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-public class NullaryConstructorWhitelist {
- public NullaryConstructorWhitelist() { x = 22; }
- public NullaryConstructorWhitelist(int y) { x = y; }
+public class NullaryConstructorConditionallyBlocked {
+ public NullaryConstructorConditionallyBlocked() { x = 22; }
+ public NullaryConstructorConditionallyBlocked(int y) { x = y; }
protected int x;
}
diff --git a/test/674-hiddenapi/src/NullaryConstructorDarkGreylist.java b/test/674-hiddenapi/src/NullaryConstructorDarkGreylist.java
deleted file mode 100644
index c25a767..0000000
--- a/test/674-hiddenapi/src/NullaryConstructorDarkGreylist.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public class NullaryConstructorDarkGreylist {
- public NullaryConstructorDarkGreylist() { x = 22; }
- public NullaryConstructorDarkGreylist(int y) { x = y; }
- protected int x;
-}
diff --git a/test/674-hiddenapi/src/NullaryConstructorLightGreylist.java b/test/674-hiddenapi/src/NullaryConstructorLightGreylist.java
deleted file mode 100644
index d5dac8b..0000000
--- a/test/674-hiddenapi/src/NullaryConstructorLightGreylist.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public class NullaryConstructorLightGreylist {
- public NullaryConstructorLightGreylist() { x = 22; }
- public NullaryConstructorLightGreylist(int y) { x = y; }
- protected int x;
-}
diff --git a/test/674-hiddenapi/src/NullaryConstructorWhitelist.java b/test/674-hiddenapi/src/NullaryConstructorSdk.java
similarity index 80%
copy from test/674-hiddenapi/src/NullaryConstructorWhitelist.java
copy to test/674-hiddenapi/src/NullaryConstructorSdk.java
index d101907..62f4fa7 100644
--- a/test/674-hiddenapi/src/NullaryConstructorWhitelist.java
+++ b/test/674-hiddenapi/src/NullaryConstructorSdk.java
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-public class NullaryConstructorWhitelist {
- public NullaryConstructorWhitelist() { x = 22; }
- public NullaryConstructorWhitelist(int y) { x = y; }
+public class NullaryConstructorSdk {
+ public NullaryConstructorSdk() { x = 22; }
+ public NullaryConstructorSdk(int y) { x = y; }
protected int x;
}
diff --git a/test/674-hiddenapi/src/NullaryConstructorWhitelist.java b/test/674-hiddenapi/src/NullaryConstructorUnsupported.java
similarity index 80%
rename from test/674-hiddenapi/src/NullaryConstructorWhitelist.java
rename to test/674-hiddenapi/src/NullaryConstructorUnsupported.java
index d101907..958472d 100644
--- a/test/674-hiddenapi/src/NullaryConstructorWhitelist.java
+++ b/test/674-hiddenapi/src/NullaryConstructorUnsupported.java
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-public class NullaryConstructorWhitelist {
- public NullaryConstructorWhitelist() { x = 22; }
- public NullaryConstructorWhitelist(int y) { x = y; }
+public class NullaryConstructorUnsupported {
+ public NullaryConstructorUnsupported() { x = 22; }
+ public NullaryConstructorUnsupported(int y) { x = y; }
protected int x;
}
diff --git a/test/674-hiddenapi/src/ParentClass.java b/test/674-hiddenapi/src/ParentClass.java
index 1442392..fc31bed 100644
--- a/test/674-hiddenapi/src/ParentClass.java
+++ b/test/674-hiddenapi/src/ParentClass.java
@@ -19,125 +19,125 @@
// INSTANCE FIELD
- public int fieldPublicWhitelist = 211;
- int fieldPackageWhitelist = 212;
- protected int fieldProtectedWhitelist = 213;
- private int fieldPrivateWhitelist = 214;
- public int fieldPublicWhitelistB = 215;
+ public int fieldPublicSdk = 211;
+ int fieldPackageSdk = 212;
+ protected int fieldProtectedSdk = 213;
+ private int fieldPrivateSdk = 214;
+ public int fieldPublicSdkB = 215;
- public int fieldPublicLightGreylist = 221;
- int fieldPackageLightGreylist = 222;
- protected int fieldProtectedLightGreylist = 223;
- private int fieldPrivateLightGreylist = 224;
- public int fieldPublicLightGreylistB = 225;
+ public int fieldPublicUnsupported = 221;
+ int fieldPackageUnsupported = 222;
+ protected int fieldProtectedUnsupported = 223;
+ private int fieldPrivateUnsupported = 224;
+ public int fieldPublicUnsupportedB = 225;
- public int fieldPublicDarkGreylist = 231;
- int fieldPackageDarkGreylist = 232;
- protected int fieldProtectedDarkGreylist = 233;
- private int fieldPrivateDarkGreylist = 234;
- public int fieldPublicDarkGreylistB = 235;
+ public int fieldPublicConditionallyBlocked = 231;
+ int fieldPackageConditionallyBlocked = 232;
+ protected int fieldProtectedConditionallyBlocked = 233;
+ private int fieldPrivateConditionallyBlocked = 234;
+ public int fieldPublicConditionallyBlockedB = 235;
- public int fieldPublicBlacklist = 241;
- int fieldPackageBlacklist = 242;
- protected int fieldProtectedBlacklist = 243;
- private int fieldPrivateBlacklist = 244;
- public int fieldPublicBlacklistB = 245;
+ public int fieldPublicBlocklist = 241;
+ int fieldPackageBlocklist = 242;
+ protected int fieldProtectedBlocklist = 243;
+ private int fieldPrivateBlocklist = 244;
+ public int fieldPublicBlocklistB = 245;
- public int fieldPublicBlacklistAndCorePlatformApi = 251;
- int fieldPackageBlacklistAndCorePlatformApi = 252;
- protected int fieldProtectedBlacklistAndCorePlatformApi = 253;
- private int fieldPrivateBlacklistAndCorePlatformApi = 254;
- public int fieldPublicBlacklistAndCorePlatformApiB = 255;
+ public int fieldPublicBlocklistAndCorePlatformApi = 251;
+ int fieldPackageBlocklistAndCorePlatformApi = 252;
+ protected int fieldProtectedBlocklistAndCorePlatformApi = 253;
+ private int fieldPrivateBlocklistAndCorePlatformApi = 254;
+ public int fieldPublicBlocklistAndCorePlatformApiB = 255;
// STATIC FIELD
- public static int fieldPublicStaticWhitelist = 111;
- static int fieldPackageStaticWhitelist = 112;
- protected static int fieldProtectedStaticWhitelist = 113;
- private static int fieldPrivateStaticWhitelist = 114;
- public static int fieldPublicStaticWhitelistB = 115;
+ public static int fieldPublicStaticSdk = 111;
+ static int fieldPackageStaticSdk = 112;
+ protected static int fieldProtectedStaticSdk = 113;
+ private static int fieldPrivateStaticSdk = 114;
+ public static int fieldPublicStaticSdkB = 115;
- public static int fieldPublicStaticLightGreylist = 121;
- static int fieldPackageStaticLightGreylist = 122;
- protected static int fieldProtectedStaticLightGreylist = 123;
- private static int fieldPrivateStaticLightGreylist = 124;
- public static int fieldPublicStaticLightGreylistB = 125;
+ public static int fieldPublicStaticUnsupported = 121;
+ static int fieldPackageStaticUnsupported = 122;
+ protected static int fieldProtectedStaticUnsupported = 123;
+ private static int fieldPrivateStaticUnsupported = 124;
+ public static int fieldPublicStaticUnsupportedB = 125;
- public static int fieldPublicStaticDarkGreylist = 131;
- static int fieldPackageStaticDarkGreylist = 132;
- protected static int fieldProtectedStaticDarkGreylist = 133;
- private static int fieldPrivateStaticDarkGreylist = 134;
- public static int fieldPublicStaticDarkGreylistB = 135;
+ public static int fieldPublicStaticConditionallyBlocked = 131;
+ static int fieldPackageStaticConditionallyBlocked = 132;
+ protected static int fieldProtectedStaticConditionallyBlocked = 133;
+ private static int fieldPrivateStaticConditionallyBlocked = 134;
+ public static int fieldPublicStaticConditionallyBlockedB = 135;
- public static int fieldPublicStaticBlacklist = 141;
- static int fieldPackageStaticBlacklist = 142;
- protected static int fieldProtectedStaticBlacklist = 143;
- private static int fieldPrivateStaticBlacklist = 144;
- public static int fieldPublicStaticBlacklistB = 145;
+ public static int fieldPublicStaticBlocklist = 141;
+ static int fieldPackageStaticBlocklist = 142;
+ protected static int fieldProtectedStaticBlocklist = 143;
+ private static int fieldPrivateStaticBlocklist = 144;
+ public static int fieldPublicStaticBlocklistB = 145;
- public static int fieldPublicStaticBlacklistAndCorePlatformApi = 151;
- static int fieldPackageStaticBlacklistAndCorePlatformApi = 152;
- protected static int fieldProtectedStaticBlacklistAndCorePlatformApi = 153;
- private static int fieldPrivateStaticBlacklistAndCorePlatformApi = 154;
- public static int fieldPublicStaticBlacklistAndCorePlatformApiB = 155;
+ public static int fieldPublicStaticBlocklistAndCorePlatformApi = 151;
+ static int fieldPackageStaticBlocklistAndCorePlatformApi = 152;
+ protected static int fieldProtectedStaticBlocklistAndCorePlatformApi = 153;
+ private static int fieldPrivateStaticBlocklistAndCorePlatformApi = 154;
+ public static int fieldPublicStaticBlocklistAndCorePlatformApiB = 155;
// INSTANCE METHOD
- public int methodPublicWhitelist() { return 411; }
- int methodPackageWhitelist() { return 412; }
- protected int methodProtectedWhitelist() { return 413; }
- private int methodPrivateWhitelist() { return 414; }
+ public int methodPublicSdk() { return 411; }
+ int methodPackageSdk() { return 412; }
+ protected int methodProtectedSdk() { return 413; }
+ private int methodPrivateSdk() { return 414; }
- public int methodPublicLightGreylist() { return 421; }
- int methodPackageLightGreylist() { return 422; }
- protected int methodProtectedLightGreylist() { return 423; }
- private int methodPrivateLightGreylist() { return 424; }
+ public int methodPublicUnsupported() { return 421; }
+ int methodPackageUnsupported() { return 422; }
+ protected int methodProtectedUnsupported() { return 423; }
+ private int methodPrivateUnsupported() { return 424; }
- public int methodPublicDarkGreylist() { return 431; }
- int methodPackageDarkGreylist() { return 432; }
- protected int methodProtectedDarkGreylist() { return 433; }
- private int methodPrivateDarkGreylist() { return 434; }
+ public int methodPublicConditionallyBlocked() { return 431; }
+ int methodPackageConditionallyBlocked() { return 432; }
+ protected int methodProtectedConditionallyBlocked() { return 433; }
+ private int methodPrivateConditionallyBlocked() { return 434; }
- public int methodPublicBlacklist() { return 441; }
- int methodPackageBlacklist() { return 442; }
- protected int methodProtectedBlacklist() { return 443; }
- private int methodPrivateBlacklist() { return 444; }
+ public int methodPublicBlocklist() { return 441; }
+ int methodPackageBlocklist() { return 442; }
+ protected int methodProtectedBlocklist() { return 443; }
+ private int methodPrivateBlocklist() { return 444; }
- public int methodPublicBlacklistAndCorePlatformApi() { return 451; }
- int methodPackageBlacklistAndCorePlatformApi() { return 452; }
- protected int methodProtectedBlacklistAndCorePlatformApi() { return 453; }
- private int methodPrivateBlacklistAndCorePlatformApi() { return 454; }
+ public int methodPublicBlocklistAndCorePlatformApi() { return 451; }
+ int methodPackageBlocklistAndCorePlatformApi() { return 452; }
+ protected int methodProtectedBlocklistAndCorePlatformApi() { return 453; }
+ private int methodPrivateBlocklistAndCorePlatformApi() { return 454; }
// STATIC METHOD
- public static int methodPublicStaticWhitelist() { return 311; }
- static int methodPackageStaticWhitelist() { return 312; }
- protected static int methodProtectedStaticWhitelist() { return 313; }
- private static int methodPrivateStaticWhitelist() { return 314; }
+ public static int methodPublicStaticSdk() { return 311; }
+ static int methodPackageStaticSdk() { return 312; }
+ protected static int methodProtectedStaticSdk() { return 313; }
+ private static int methodPrivateStaticSdk() { return 314; }
- public static int methodPublicStaticLightGreylist() { return 321; }
- static int methodPackageStaticLightGreylist() { return 322; }
- protected static int methodProtectedStaticLightGreylist() { return 323; }
- private static int methodPrivateStaticLightGreylist() { return 324; }
+ public static int methodPublicStaticUnsupported() { return 321; }
+ static int methodPackageStaticUnsupported() { return 322; }
+ protected static int methodProtectedStaticUnsupported() { return 323; }
+ private static int methodPrivateStaticUnsupported() { return 324; }
- public static int methodPublicStaticDarkGreylist() { return 331; }
- static int methodPackageStaticDarkGreylist() { return 332; }
- protected static int methodProtectedStaticDarkGreylist() { return 333; }
- private static int methodPrivateStaticDarkGreylist() { return 334; }
+ public static int methodPublicStaticConditionallyBlocked() { return 331; }
+ static int methodPackageStaticConditionallyBlocked() { return 332; }
+ protected static int methodProtectedStaticConditionallyBlocked() { return 333; }
+ private static int methodPrivateStaticConditionallyBlocked() { return 334; }
- public static int methodPublicStaticBlacklist() { return 341; }
- static int methodPackageStaticBlacklist() { return 342; }
- protected static int methodProtectedStaticBlacklist() { return 343; }
- private static int methodPrivateStaticBlacklist() { return 344; }
+ public static int methodPublicStaticBlocklist() { return 341; }
+ static int methodPackageStaticBlocklist() { return 342; }
+ protected static int methodProtectedStaticBlocklist() { return 343; }
+ private static int methodPrivateStaticBlocklist() { return 344; }
- public static int methodPublicStaticBlacklistAndCorePlatformApi() { return 351; }
- static int methodPackageStaticBlacklistAndCorePlatformApi() { return 352; }
- protected static int methodProtectedStaticBlacklistAndCorePlatformApi() { return 353; }
- private static int methodPrivateStaticBlacklistAndCorePlatformApi() { return 354; }
+ public static int methodPublicStaticBlocklistAndCorePlatformApi() { return 351; }
+ static int methodPackageStaticBlocklistAndCorePlatformApi() { return 352; }
+ protected static int methodProtectedStaticBlocklistAndCorePlatformApi() { return 353; }
+ private static int methodPrivateStaticBlocklistAndCorePlatformApi() { return 354; }
// CONSTRUCTOR
- // Whitelist
+ // Sdk
public ParentClass(int x, short y) {}
ParentClass(float x, short y) {}
protected ParentClass(long x, short y) {}
@@ -155,13 +155,13 @@
protected ParentClass(long x, byte y) {}
private ParentClass(double x, byte y) {}
- // Blacklist
+ // Blocklist
public ParentClass(int x, char y) {}
ParentClass(float x, char y) {}
protected ParentClass(long x, char y) {}
private ParentClass(double x, char y) {}
- // Blacklist and CorePlatformApi
+ // Blocklist and CorePlatformApi
public ParentClass(int x, int y) {}
ParentClass(float x, int y) {}
protected ParentClass(long x, int y) {}
@@ -169,31 +169,31 @@
// HELPERS
- public int callMethodPublicWhitelist() { return methodPublicWhitelist(); }
- public int callMethodPackageWhitelist() { return methodPackageWhitelist(); }
- public int callMethodProtectedWhitelist() { return methodProtectedWhitelist(); }
+ public int callMethodPublicSdk() { return methodPublicSdk(); }
+ public int callMethodPackageSdk() { return methodPackageSdk(); }
+ public int callMethodProtectedSdk() { return methodProtectedSdk(); }
- public int callMethodPublicLightGreylist() { return methodPublicLightGreylist(); }
- public int callMethodPackageLightGreylist() { return methodPackageLightGreylist(); }
- public int callMethodProtectedLightGreylist() { return methodProtectedLightGreylist(); }
+ public int callMethodPublicUnsupported() { return methodPublicUnsupported(); }
+ public int callMethodPackageUnsupported() { return methodPackageUnsupported(); }
+ public int callMethodProtectedUnsupported() { return methodProtectedUnsupported(); }
- public int callMethodPublicDarkGreylist() { return methodPublicDarkGreylist(); }
- public int callMethodPackageDarkGreylist() { return methodPackageDarkGreylist(); }
- public int callMethodProtectedDarkGreylist() { return methodProtectedDarkGreylist(); }
+ public int callMethodPublicConditionallyBlocked() { return methodPublicConditionallyBlocked(); }
+ public int callMethodPackageConditionallyBlocked() { return methodPackageConditionallyBlocked(); }
+ public int callMethodProtectedConditionallyBlocked() { return methodProtectedConditionallyBlocked(); }
- public int callMethodPublicBlacklist() { return methodPublicBlacklist(); }
- public int callMethodPackageBlacklist() { return methodPackageBlacklist(); }
- public int callMethodProtectedBlacklist() { return methodProtectedBlacklist(); }
+ public int callMethodPublicBlocklist() { return methodPublicBlocklist(); }
+ public int callMethodPackageBlocklist() { return methodPackageBlocklist(); }
+ public int callMethodProtectedBlocklist() { return methodProtectedBlocklist(); }
- public int callMethodPublicBlacklistAndCorePlatformApi() {
- return methodPublicBlacklistAndCorePlatformApi();
+ public int callMethodPublicBlocklistAndCorePlatformApi() {
+ return methodPublicBlocklistAndCorePlatformApi();
}
- public int callMethodPackageBlacklistAndCorePlatformApi() {
- return methodPackageBlacklistAndCorePlatformApi();
+ public int callMethodPackageBlocklistAndCorePlatformApi() {
+ return methodPackageBlocklistAndCorePlatformApi();
}
- public int callMethodProtectedBlacklistAndCorePlatformApi() {
- return methodProtectedBlacklistAndCorePlatformApi();
+ public int callMethodProtectedBlocklistAndCorePlatformApi() {
+ return methodProtectedBlocklistAndCorePlatformApi();
}
}
diff --git a/test/674-hiddenapi/src/ParentInterface.java b/test/674-hiddenapi/src/ParentInterface.java
index 1c5b58f..08334c0 100644
--- a/test/674-hiddenapi/src/ParentInterface.java
+++ b/test/674-hiddenapi/src/ParentInterface.java
@@ -16,30 +16,30 @@
public interface ParentInterface {
// STATIC FIELD
- static int fieldPublicStaticWhitelist = 11;
- static int fieldPublicStaticLightGreylist = 12;
- static int fieldPublicStaticDarkGreylist = 13;
- static int fieldPublicStaticBlacklist = 14;
- static int fieldPublicStaticBlacklistAndCorePlatformApi = 15;
+ static int fieldPublicStaticSdk = 11;
+ static int fieldPublicStaticUnsupported = 12;
+ static int fieldPublicStaticConditionallyBlocked = 13;
+ static int fieldPublicStaticBlocklist = 14;
+ static int fieldPublicStaticBlocklistAndCorePlatformApi = 15;
// INSTANCE METHOD
- int methodPublicWhitelist();
- int methodPublicLightGreylist();
- int methodPublicDarkGreylist();
- int methodPublicBlacklist();
- int methodPublicBlacklistAndCorePlatformApi();
+ int methodPublicSdk();
+ int methodPublicUnsupported();
+ int methodPublicConditionallyBlocked();
+ int methodPublicBlocklist();
+ int methodPublicBlocklistAndCorePlatformApi();
// STATIC METHOD
- static int methodPublicStaticWhitelist() { return 21; }
- static int methodPublicStaticLightGreylist() { return 22; }
- static int methodPublicStaticDarkGreylist() { return 23; }
- static int methodPublicStaticBlacklist() { return 24; }
- static int methodPublicStaticBlacklistAndCorePlatformApi() { return 25; }
+ static int methodPublicStaticSdk() { return 21; }
+ static int methodPublicStaticUnsupported() { return 22; }
+ static int methodPublicStaticConditionallyBlocked() { return 23; }
+ static int methodPublicStaticBlocklist() { return 24; }
+ static int methodPublicStaticBlocklistAndCorePlatformApi() { return 25; }
// DEFAULT METHOD
- default int methodPublicDefaultWhitelist() { return 31; }
- default int methodPublicDefaultLightGreylist() { return 32; }
- default int methodPublicDefaultDarkGreylist() { return 33; }
- default int methodPublicDefaultBlacklist() { return 34; }
- default int methodPublicDefaultBlacklistAndCorePlatformApi() { return 35; }
+ default int methodPublicDefaultSdk() { return 31; }
+ default int methodPublicDefaultUnsupported() { return 32; }
+ default int methodPublicDefaultConditionallyBlocked() { return 33; }
+ default int methodPublicDefaultBlocklist() { return 34; }
+ default int methodPublicDefaultBlocklistAndCorePlatformApi() { return 35; }
}
diff --git a/test/674-hiddenapi/src/SampleClass.java b/test/674-hiddenapi/src/SampleClass.java
index b2dcd1f..b7dd6ec 100644
--- a/test/674-hiddenapi/src/SampleClass.java
+++ b/test/674-hiddenapi/src/SampleClass.java
@@ -15,11 +15,11 @@
*/
public class SampleClass implements ParentInterface {
- public int methodPublicWhitelist() { return 1; }
- public int methodPublicLightGreylist() { return 2; }
- public int methodPublicDarkGreylist() { return 3; }
- public int methodPublicBlacklist() { return 4; }
- public int methodPublicBlacklistAndCorePlatformApi() { return 5; }
+ public int methodPublicSdk() { return 1; }
+ public int methodPublicUnsupported() { return 2; }
+ public int methodPublicConditionallyBlocked() { return 3; }
+ public int methodPublicBlocklist() { return 4; }
+ public int methodPublicBlocklistAndCorePlatformApi() { return 5; }
public static ParentInterface getInterfaceInstance() {
return new SampleClass();