Merge commit '5b08961299d45712f3f752ff2107a8d10b422066' into manual_merge_5b08961299d45712f3f752ff2107a8d10b422066temp_sam_168057903

Merged-In: I0047dc368c339b4b7b0d75a500a397ba02828276
Change-Id: I7ceb8c47567773b5ebdb0e63652b4c4b47eb06a3

33 files changed, 65 insertions, 58 deletions

diff --git a/tests/signature/TEST_MAPPING b/tests/signature/TEST_MAPPING
index 810f3f716c7..1217e0ce9a4 100644
--- a/tests/signature/TEST_MAPPING
+++ b/tests/signature/TEST_MAPPING
@@ -31,7 +31,7 @@
         "name": "CtsHiddenApiKillswitchDebugClassTestCases"
     },
     {
-        "name": "CtsHiddenApiKillswitchWhitelistTestCases"
+        "name": "CtsHiddenApiKillswitchSdklistTestCases"
     },
     {
         "name": "CtsHiddenApiKillswitchWildcardTestCases"
@@ -52,19 +52,19 @@
   ],
   "postsubmit": [
     {
-      "name": "CtsHiddenApiBlacklistApi27TestCases"
+      "name": "CtsHiddenApiBlocklistApi27TestCases"
     },
     {
-        "name": "CtsHiddenApiBlacklistApi28TestCases"
+        "name": "CtsHiddenApiBlocklistApi28TestCases"
     },
     {
-      "name": "CtsHiddenApiBlacklistCurrentApiTestCases"
+      "name": "CtsHiddenApiBlocklistCurrentApiTestCases"
     },
     {
-      "name": "CtsHiddenApiBlacklistTestApiTestCases"
+      "name": "CtsHiddenApiBlocklistTestApiTestCases"
     },
     {
-      "name": "CtsHiddenApiBlacklistDebugClassTestCases"
+      "name": "CtsHiddenApiBlocklistDebugClassTestCases"
     }
   ]
 }
diff --git a/tests/signature/api-check/Android.bp b/tests/signature/api-check/Android.bp
index ceb82a40022..cfc485010fd 100644
--- a/tests/signature/api-check/Android.bp
+++ b/tests/signature/api-check/Android.bp
@@ -72,9 +72,9 @@ hiddenapi_flags {
     filename: "hiddenapi-flags.csv",
 }
 
-// Defaults for hiddenapi blacklist checks.
+// Defaults for hiddenapi blocklist checks.
 java_defaults {
-    name: "hiddenapi-blacklist-check-defaults",
+    name: "hiddenapi-blocklist-check-defaults",
     defaults: ["signature-api-check-defaults"],
     java_resources: [
         ":cts-hiddenapi-flags-csv",
diff --git a/tests/signature/api-check/hidden-api-blacklist-27-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-27-api/Android.bp
index 71a69028266..fb706fc5371 100644
--- a/tests/signature/api-check/hidden-api-blacklist-27-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-27-api/Android.bp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 android_test {
-    name: "CtsHiddenApiBlacklistApi27TestCases",
+    name: "CtsHiddenApiBlocklistApi27TestCases",
     defaults: [
-        "hiddenapi-blacklist-check-defaults",
+        "hiddenapi-blocklist-check-defaults",
     ],
     min_sdk_version: "27",
 
diff --git a/tests/signature/api-check/hidden-api-blacklist-27-api/AndroidManifest.xml b/tests/signature/api-check/hidden-api-blocklist-27-api/AndroidManifest.xml
index 144d631e26d..84c73fcc1cb 100644
--- a/tests/signature/api-check/hidden-api-blacklist-27-api/AndroidManifest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-27-api/AndroidManifest.xml
@@ -16,7 +16,7 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.signature.cts.api.hiddenapi_blacklist_api_27"
+          package="android.signature.cts.api.hiddenapi_blocklist_api_27"
           android:targetSandboxVersion="2">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
@@ -26,6 +26,6 @@
 
     <instrumentation
         android:name="repackaged.android.test.InstrumentationTestRunner"
-        android:targetPackage="android.signature.cts.api.hiddenapi_blacklist_api_27"
-        android:label="Hidden API Blacklist Test for SDK level 27"/>
+        android:targetPackage="android.signature.cts.api.hiddenapi_blocklist_api_27"
+        android:label="Hidden API Blocklist Test for SDK level 27"/>
 </manifest>
diff --git a/tests/signature/api-check/hidden-api-blacklist-27-api/AndroidTest.xml b/tests/signature/api-check/hidden-api-blocklist-27-api/AndroidTest.xml
index 2df270fd928..2d1a0a93729 100644
--- a/tests/signature/api-check/hidden-api-blacklist-27-api/AndroidTest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-27-api/AndroidTest.xml
@@ -21,10 +21,10 @@
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsHiddenApiBlacklistApi27TestCases.apk" />
+        <option name="test-file-name" value="CtsHiddenApiBlocklistApi27TestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.signature.cts.api.hiddenapi_blacklist_api_27" />
+        <option name="package" value="android.signature.cts.api.hiddenapi_blocklist_api_27" />
         <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
         <option name="class" value="android.signature.cts.api.api27.HiddenApiTest" />
         <option name="instrumentation-arg" key="hiddenapi-files" value="hiddenapi-flags.csv" />
diff --git a/tests/signature/api-check/hidden-api-blacklist-27-api/OWNERS b/tests/signature/api-check/hidden-api-blocklist-27-api/OWNERS
index e840a105410..e840a105410 100644
--- a/tests/signature/api-check/hidden-api-blacklist-27-api/OWNERS
+++ b/tests/signature/api-check/hidden-api-blocklist-27-api/OWNERS
diff --git a/tests/signature/api-check/hidden-api-blocklist-27-api/TEST_MAPPING b/tests/signature/api-check/hidden-api-blocklist-27-api/TEST_MAPPING
new file mode 100644
index 00000000000..23bb800e6ed
--- /dev/null
+++ b/tests/signature/api-check/hidden-api-blocklist-27-api/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsHiddenApiBlocklistApi27TestCases"
+    }
+  ]
+}
diff --git a/tests/signature/api-check/hidden-api-blacklist-27-api/src/android/signature/cts/api/api27/HiddenApiTest.java b/tests/signature/api-check/hidden-api-blocklist-27-api/src/android/signature/cts/api/api27/HiddenApiTest.java
index c940aac9c67..c940aac9c67 100644
--- a/tests/signature/api-check/hidden-api-blacklist-27-api/src/android/signature/cts/api/api27/HiddenApiTest.java
+++ b/tests/signature/api-check/hidden-api-blocklist-27-api/src/android/signature/cts/api/api27/HiddenApiTest.java
diff --git a/tests/signature/api-check/hidden-api-blacklist-28-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-28-api/Android.bp
index 5671a40c7f3..da459b1a0de 100644
--- a/tests/signature/api-check/hidden-api-blacklist-28-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-28-api/Android.bp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 android_test {
-    name: "CtsHiddenApiBlacklistApi28TestCases",
+    name: "CtsHiddenApiBlocklistApi28TestCases",
     defaults: [
-        "hiddenapi-blacklist-check-defaults",
+        "hiddenapi-blocklist-check-defaults",
     ],
     min_sdk_version: "27",
 
diff --git a/tests/signature/api-check/hidden-api-blacklist-28-api/AndroidManifest.xml b/tests/signature/api-check/hidden-api-blocklist-28-api/AndroidManifest.xml
index 919cd007e3b..81c473a0d1f 100644
--- a/tests/signature/api-check/hidden-api-blacklist-28-api/AndroidManifest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-28-api/AndroidManifest.xml
@@ -16,7 +16,7 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.signature.cts.api.hiddenapi_blacklist_api_28"
+          package="android.signature.cts.api.hiddenapi_blocklist_api_28"
           android:targetSandboxVersion="2">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
@@ -26,6 +26,6 @@
 
     <instrumentation
         android:name="repackaged.android.test.InstrumentationTestRunner"
-        android:targetPackage="android.signature.cts.api.hiddenapi_blacklist_api_28"
-        android:label="Hidden API Blacklist Test for SDK level 28"/>
+        android:targetPackage="android.signature.cts.api.hiddenapi_blocklist_api_28"
+        android:label="Hidden API Blocklist Test for SDK level 28"/>
 </manifest>
diff --git a/tests/signature/api-check/hidden-api-blacklist-28-api/AndroidTest.xml b/tests/signature/api-check/hidden-api-blocklist-28-api/AndroidTest.xml
index f06213b9698..5d7d8858ca5 100644
--- a/tests/signature/api-check/hidden-api-blacklist-28-api/AndroidTest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-28-api/AndroidTest.xml
@@ -21,10 +21,10 @@
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsHiddenApiBlacklistApi28TestCases.apk" />
+        <option name="test-file-name" value="CtsHiddenApiBlocklistApi28TestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.signature.cts.api.hiddenapi_blacklist_api_28" />
+        <option name="package" value="android.signature.cts.api.hiddenapi_blocklist_api_28" />
         <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
         <option name="class" value="android.signature.cts.api.api28.HiddenApiTest" />
         <option name="instrumentation-arg" key="hiddenapi-files" value="hiddenapi-flags.csv" />
diff --git a/tests/signature/api-check/hidden-api-blacklist-28-api/OWNERS b/tests/signature/api-check/hidden-api-blocklist-28-api/OWNERS
index e840a105410..e840a105410 100644
--- a/tests/signature/api-check/hidden-api-blacklist-28-api/OWNERS
+++ b/tests/signature/api-check/hidden-api-blocklist-28-api/OWNERS
diff --git a/tests/signature/api-check/hidden-api-blacklist-28-api/src/android/signature/cts/api/api28/HiddenApiTest.java b/tests/signature/api-check/hidden-api-blocklist-28-api/src/android/signature/cts/api/api28/HiddenApiTest.java
index f85dda39ba5..f85dda39ba5 100644
--- a/tests/signature/api-check/hidden-api-blacklist-28-api/src/android/signature/cts/api/api28/HiddenApiTest.java
+++ b/tests/signature/api-check/hidden-api-blocklist-28-api/src/android/signature/cts/api/api28/HiddenApiTest.java
diff --git a/tests/signature/api-check/hidden-api-blacklist-current-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-current-api/Android.bp
index ec730b0551d..8c559f08cf6 100644
--- a/tests/signature/api-check/hidden-api-blacklist-current-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-current-api/Android.bp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 android_test {
-    name: "CtsHiddenApiBlacklistCurrentApiTestCases",
+    name: "CtsHiddenApiBlocklistCurrentApiTestCases",
     defaults: [
-        "hiddenapi-blacklist-check-defaults",
+        "hiddenapi-blocklist-check-defaults",
     ],
 
     use_embedded_native_libs: false,
diff --git a/tests/signature/api-check/hidden-api-blacklist-current-api/AndroidManifest.xml b/tests/signature/api-check/hidden-api-blocklist-current-api/AndroidManifest.xml
index a17daac94fb..35047d55dd3 100644
--- a/tests/signature/api-check/hidden-api-blacklist-current-api/AndroidManifest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-current-api/AndroidManifest.xml
@@ -16,7 +16,7 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.signature.cts.api.hiddenapi_blacklist_current"
+          package="android.signature.cts.api.hiddenapi_blocklist_current"
           android:targetSandboxVersion="2">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
@@ -25,6 +25,6 @@
 
     <instrumentation
         android:name="repackaged.android.test.InstrumentationTestRunner"
-        android:targetPackage="android.signature.cts.api.hiddenapi_blacklist_current"
-        android:label="Hidden API Blacklist Test for current SDK"/>
+        android:targetPackage="android.signature.cts.api.hiddenapi_blocklist_current"
+        android:label="Hidden API Blocklist Test for current SDK"/>
 </manifest>
diff --git a/tests/signature/api-check/hidden-api-blacklist-current-api/AndroidTest.xml b/tests/signature/api-check/hidden-api-blocklist-current-api/AndroidTest.xml
index 22c7022f1e5..5d020ea99a9 100644
--- a/tests/signature/api-check/hidden-api-blacklist-current-api/AndroidTest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-current-api/AndroidTest.xml
@@ -21,10 +21,10 @@
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsHiddenApiBlacklistCurrentApiTestCases.apk" />
+        <option name="test-file-name" value="CtsHiddenApiBlocklistCurrentApiTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.signature.cts.api.hiddenapi_blacklist_current" />
+        <option name="package" value="android.signature.cts.api.hiddenapi_blocklist_current" />
         <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
         <option name="class" value="android.signature.cts.api.current.HiddenApiTest" />
         <option name="instrumentation-arg" key="hiddenapi-files" value="hiddenapi-flags.csv" />
diff --git a/tests/signature/api-check/hidden-api-blacklist-current-api/OWNERS b/tests/signature/api-check/hidden-api-blocklist-current-api/OWNERS
index 39dbe176c62..39dbe176c62 100644
--- a/tests/signature/api-check/hidden-api-blacklist-current-api/OWNERS
+++ b/tests/signature/api-check/hidden-api-blocklist-current-api/OWNERS
diff --git a/tests/signature/api-check/hidden-api-blacklist-current-api/src/android/signature/cts/api/current/HiddenApiTest.java b/tests/signature/api-check/hidden-api-blocklist-current-api/src/android/signature/cts/api/current/HiddenApiTest.java
index 34f33fec29f..34f33fec29f 100644
--- a/tests/signature/api-check/hidden-api-blacklist-current-api/src/android/signature/cts/api/current/HiddenApiTest.java
+++ b/tests/signature/api-check/hidden-api-blocklist-current-api/src/android/signature/cts/api/current/HiddenApiTest.java
diff --git a/tests/signature/api-check/hidden-api-blacklist-debug-class/Android.bp b/tests/signature/api-check/hidden-api-blocklist-debug-class/Android.bp
index bfb5c8f8999..09513a5395b 100644
--- a/tests/signature/api-check/hidden-api-blacklist-debug-class/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-debug-class/Android.bp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 android_test {
-    name: "CtsHiddenApiBlacklistDebugClassTestCases",
+    name: "CtsHiddenApiBlocklistDebugClassTestCases",
     defaults: [
-        "hiddenapi-blacklist-check-defaults",
+        "hiddenapi-blocklist-check-defaults",
     ],
 
     use_embedded_native_libs: false,
diff --git a/tests/signature/api-check/hidden-api-blacklist-debug-class/AndroidManifest.xml b/tests/signature/api-check/hidden-api-blocklist-debug-class/AndroidManifest.xml
index 8646c800076..21b175693ca 100644
--- a/tests/signature/api-check/hidden-api-blacklist-debug-class/AndroidManifest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-debug-class/AndroidManifest.xml
@@ -16,7 +16,7 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.signature.cts.api.hiddenapi_blacklist_debug_class"
+          package="android.signature.cts.api.hiddenapi_blocklist_debug_class"
           android:targetSandboxVersion="2">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
@@ -25,6 +25,6 @@
 
     <instrumentation
         android:name="repackaged.android.test.InstrumentationTestRunner"
-        android:targetPackage="android.signature.cts.api.hiddenapi_blacklist_debug_class"
-        android:label="Hidden API Blacklist Test with Debug Class Exempt"/>
+        android:targetPackage="android.signature.cts.api.hiddenapi_blocklist_debug_class"
+        android:label="Hidden API Blocklist Test with Debug Class Exempt"/>
 </manifest>
diff --git a/tests/signature/api-check/hidden-api-blacklist-debug-class/AndroidTest.xml b/tests/signature/api-check/hidden-api-blocklist-debug-class/AndroidTest.xml
index 6ded1c0c9c3..73212ad3e03 100644
--- a/tests/signature/api-check/hidden-api-blacklist-debug-class/AndroidTest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-debug-class/AndroidTest.xml
@@ -21,10 +21,10 @@
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsHiddenApiBlacklistDebugClassTestCases.apk" />
+        <option name="test-file-name" value="CtsHiddenApiBlocklistDebugClassTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.signature.cts.api.hiddenapi_blacklist_debug_class" />
+        <option name="package" value="android.signature.cts.api.hiddenapi_blocklist_debug_class" />
         <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
         <option name="class" value="android.signature.cts.api.DebugClassHiddenApiTest" />
         <option name="instrumentation-arg" key="hiddenapi-files" value="hiddenapi-flags.csv" />
diff --git a/tests/signature/api-check/hidden-api-blacklist-debug-class/OWNERS b/tests/signature/api-check/hidden-api-blocklist-debug-class/OWNERS
index e840a105410..e840a105410 100644
--- a/tests/signature/api-check/hidden-api-blacklist-debug-class/OWNERS
+++ b/tests/signature/api-check/hidden-api-blocklist-debug-class/OWNERS
diff --git a/tests/signature/api-check/hidden-api-blacklist-test-api/Android.bp b/tests/signature/api-check/hidden-api-blocklist-test-api/Android.bp
index 6ff5ceac46f..f62497875f8 100644
--- a/tests/signature/api-check/hidden-api-blacklist-test-api/Android.bp
+++ b/tests/signature/api-check/hidden-api-blocklist-test-api/Android.bp
@@ -13,9 +13,9 @@
 // limitations under the License.
 
 android_test {
-    name: "CtsHiddenApiBlacklistTestApiTestCases",
+    name: "CtsHiddenApiBlocklistTestApiTestCases",
     defaults: [
-        "hiddenapi-blacklist-check-defaults",
+        "hiddenapi-blocklist-check-defaults",
     ],
     use_embedded_native_libs: false,
     test_suites: [
diff --git a/tests/signature/api-check/hidden-api-blacklist-test-api/AndroidManifest.xml b/tests/signature/api-check/hidden-api-blocklist-test-api/AndroidManifest.xml
index 076f99d494a..1696c0a54f6 100644
--- a/tests/signature/api-check/hidden-api-blacklist-test-api/AndroidManifest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-test-api/AndroidManifest.xml
@@ -16,7 +16,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.signature.cts.api.hiddenapi_blacklist_test"
+          package="android.signature.cts.api.hiddenapi_blocklist_test"
           android:targetSandboxVersion="2">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
@@ -24,7 +24,7 @@
     <application android:extractNativeLibs="true" android:largeHeap="true"/>
 
     <instrumentation android:name="repackaged.android.test.InstrumentationTestRunner"
-                     android:targetPackage="android.signature.cts.api.hiddenapi_blacklist_test"
-                     android:label="Hidden API Blacklist Test for test SDK"/>
+                     android:targetPackage="android.signature.cts.api.hiddenapi_blocklist_test"
+                     android:label="Hidden API Blocklist Test for test SDK"/>
 
 </manifest>
diff --git a/tests/signature/api-check/hidden-api-blacklist-test-api/AndroidTest.xml b/tests/signature/api-check/hidden-api-blocklist-test-api/AndroidTest.xml
index 313b8b3072f..b08abec3650 100644
--- a/tests/signature/api-check/hidden-api-blacklist-test-api/AndroidTest.xml
+++ b/tests/signature/api-check/hidden-api-blocklist-test-api/AndroidTest.xml
@@ -22,10 +22,10 @@
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsHiddenApiBlacklistTestApiTestCases.apk" />
+        <option name="test-file-name" value="CtsHiddenApiBlocklistTestApiTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.signature.cts.api.hiddenapi_blacklist_test" />
+        <option name="package" value="android.signature.cts.api.hiddenapi_blocklist_test" />
         <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
         <option name="class" value="android.signature.cts.api.test.HiddenApiTest" />
         <option name="instrumentation-arg" key="hiddenapi-files" value="hiddenapi-flags.csv" />
diff --git a/tests/signature/api-check/hidden-api-blacklist-test-api/OWNERS b/tests/signature/api-check/hidden-api-blocklist-test-api/OWNERS
index 66ea541649e..66ea541649e 100644
--- a/tests/signature/api-check/hidden-api-blacklist-test-api/OWNERS
+++ b/tests/signature/api-check/hidden-api-blocklist-test-api/OWNERS
diff --git a/tests/signature/api-check/hidden-api-blacklist-test-api/src/android/signature/cts/api/test/HiddenApiTest.java b/tests/signature/api-check/hidden-api-blocklist-test-api/src/android/signature/cts/api/test/HiddenApiTest.java
index 7cefb5c2d9f..7cefb5c2d9f 100644
--- a/tests/signature/api-check/hidden-api-blacklist-test-api/src/android/signature/cts/api/test/HiddenApiTest.java
+++ b/tests/signature/api-check/hidden-api-blocklist-test-api/src/android/signature/cts/api/test/HiddenApiTest.java
diff --git a/tests/signature/api-check/hidden-api-killswitch-whitelist/Android.bp b/tests/signature/api-check/hidden-api-killswitch-sdklist/Android.bp
index 5fe8f1d04c1..fa206497e39 100644
--- a/tests/signature/api-check/hidden-api-killswitch-whitelist/Android.bp
+++ b/tests/signature/api-check/hidden-api-killswitch-sdklist/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 android_test {
-    name: "CtsHiddenApiKillswitchWhitelistTestCases",
+    name: "CtsHiddenApiKillswitchSdkListTestCases",
     defaults: ["hiddenapi-killswitch-check-defaults"],
 
     use_embedded_native_libs: false,
diff --git a/tests/signature/api-check/hidden-api-killswitch-whitelist/AndroidManifest.xml b/tests/signature/api-check/hidden-api-killswitch-sdklist/AndroidManifest.xml
index 54f61f9773b..ea1eb84441e 100644
--- a/tests/signature/api-check/hidden-api-killswitch-whitelist/AndroidManifest.xml
+++ b/tests/signature/api-check/hidden-api-killswitch-sdklist/AndroidManifest.xml
@@ -16,7 +16,7 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.signature.cts.api.killswitch_whitelist"
+          package="android.signature.cts.api.killswitch_sdklist"
           android:targetSandboxVersion="2">
 
     <application android:debuggable="true"
@@ -24,6 +24,6 @@
                  android:largeHeap="true"/>
 
     <instrumentation android:name="repackaged.android.test.InstrumentationTestRunner"
-                     android:targetPackage="android.signature.cts.api.killswitch_whitelist"
-                     android:label="Hidden API Killswitch Whitelist Test"/>
+                     android:targetPackage="android.signature.cts.api.killswitch_sdklist"
+                     android:label="Hidden API Killswitch SDK list Test"/>
 </manifest>
diff --git a/tests/signature/api-check/hidden-api-killswitch-whitelist/AndroidTest.xml b/tests/signature/api-check/hidden-api-killswitch-sdklist/AndroidTest.xml
index 95791268ad0..a9b1035aa26 100644
--- a/tests/signature/api-check/hidden-api-killswitch-whitelist/AndroidTest.xml
+++ b/tests/signature/api-check/hidden-api-killswitch-sdklist/AndroidTest.xml
@@ -20,19 +20,19 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-        <!-- Whitelist all APIs before running the test, then reset this afterwards. The test
-             is intended to verify the behaviour when all APIs are whitelisted. -->
+        <!-- Mark all APIs as sdk before running the test, then reset this afterwards. The test
+             is intended to verify the behaviour when all APIs are in the SDK. -->
         <option name="run-command" value="settings put global hidden_api_blacklist_exemptions L" />
         <option name="teardown-command" value="settings delete global hidden_api_blacklist_exemptions" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsHiddenApiKillswitchWhitelistTestCases.apk" />
+        <option name="test-file-name" value="CtsHiddenApiKillswitchSdkListTestCases.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.signature.cts.api.killswitch_whitelist" />
+        <option name="package" value="android.signature.cts.api.killswitch_sdklist" />
         <option name="runner" value="repackaged.android.test.InstrumentationTestRunner" />
-        <option name="class" value="android.signature.cts.api.WhitelistKillswitchTest" />
+        <option name="class" value="android.signature.cts.api.SdkListKillswitchTest" />
         <option name="runtime-hint" value="60s" />
     </test>
 
diff --git a/tests/signature/api-check/hidden-api-killswitch-whitelist/OWNERS b/tests/signature/api-check/hidden-api-killswitch-sdklist/OWNERS
index e840a105410..e840a105410 100644
--- a/tests/signature/api-check/hidden-api-killswitch-whitelist/OWNERS
+++ b/tests/signature/api-check/hidden-api-killswitch-sdklist/OWNERS
diff --git a/tests/signature/api-check/src/java/android/signature/cts/api/WhitelistKillswitchTest.java b/tests/signature/api-check/src/java/android/signature/cts/api/SdkListKillswitchTest.java
index 52e93d2fc03..979c4ac209f 100644
--- a/tests/signature/api-check/src/java/android/signature/cts/api/WhitelistKillswitchTest.java
+++ b/tests/signature/api-check/src/java/android/signature/cts/api/SdkListKillswitchTest.java
@@ -16,7 +16,7 @@
 
 package android.signature.cts.api;
 
-public class WhitelistKillswitchTest extends BaseKillswitchTest {
+public class SdkListKillswitchTest extends BaseKillswitchTest {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
diff --git a/tests/signature/runSignatureTests.sh b/tests/signature/runSignatureTests.sh
index 56d267931d2..2371e0a0825 100755
--- a/tests/signature/runSignatureTests.sh
+++ b/tests/signature/runSignatureTests.sh
@@ -26,13 +26,13 @@ CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
 
 CtsSystemApiAnnotationTestCases
 
-CtsHiddenApiBlacklistCurrentApiTestCases
-CtsHiddenApiBlacklistApi27TestCases
-CtsHiddenApiBlacklistApi28TestCases
-CtsHiddenApiBlacklistDebugClassTestCases
+CtsHiddenApiBlocklistCurrentApiTestCases
+CtsHiddenApiBlocklistApi27TestCases
+CtsHiddenApiBlocklistApi28TestCases
+CtsHiddenApiBlocklistDebugClassTestCases
 
 CtsHiddenApiKillswitchWildcardTestCases
-CtsHiddenApiKillswitchWhitelistTestCases
+CtsHiddenApiKillswitchSdklistTestCases
 CtsHiddenApiKillswitchDebugClassTestCases
 
 CtsSharedLibsApiSignatureTestCases