Snap for 6596687 from 3e15052d4e61e23f3943c6f0baede4f6933ad044 to rvc-d1-release

Change-Id: I75192a3fafd5033ab96641af042be6b6561fe9d4

shim/README.md

diff --git a/shim/README.md b/shim/README.md
index 4bb5465..7506a97 100644
--- a/shim/README.md
+++ b/shim/README.md
@@ -12,7 +12,7 @@
 *   First version (i.e. `com.android.apex.cts.shim.apex`) should be
     pre-installed on the /system/partition.
 *   `apex_payload.img` of the pre-installed shim apexcontains a single text
-    file called `hash.txt` with a whitelist of SHA512 hashes of versions shim
+    file called `hash.txt` with a list of allowed SHA512 hashes of versions shim
     apex can be upgraded to.
 *   `apex_payload.img` of all other versions contains SHA512 hash of
     `/dev/null`.

shim/build/Android.bp

diff --git a/shim/build/Android.bp b/shim/build/Android.bp
index 1ad6f51..b8deb8f 100644
--- a/shim/build/Android.bp
+++ b/shim/build/Android.bp
@@ -57,7 +57,7 @@
   prebuilts: ["hash_of_dev_null"],
   apps: ["CtsShim", "CtsShimPriv"],
   installable: false,
-  whitelisted_files: "default_shim_whitelist.txt",
+  allowed_files: "default_shim_allowed_list.txt",
 }
 
 apex {
@@ -69,7 +69,7 @@
   prebuilts: ["hash_of_dev_null"],
   apps: ["CtsShim", "CtsShimPriv"],
   installable: false,
-  whitelisted_files: "default_shim_whitelist.txt",
+  allowed_files: "default_shim_allowed_list.txt",
 }
 
 apex {
@@ -80,7 +80,7 @@
   key: "com.android.apex.cts.shim.key",
   prebuilts: ["hash_of_dev_null"],
   installable: false,
-  whitelisted_files: "default_shim_whitelist.txt",
+  allowed_files: "default_shim_allowed_list.txt",
 }
 
 apex {
@@ -92,7 +92,7 @@
   prebuilts: ["hash_of_dev_null"],
   apps: ["CtsShim", "CtsShimPriv"],
   installable: false,
-  whitelisted_files: "default_shim_whitelist.txt",
+  allowed_files: "default_shim_allowed_list.txt",
   test_only_no_hashtree: true,
 }
 
@@ -105,7 +105,7 @@
   prebuilts: ["hash_of_dev_null"],
   apps: ["CtsShim", "CtsShimPriv"],
   installable: false,
-  whitelisted_files: "default_shim_whitelist.txt",
+  allowed_files: "default_shim_allowed_list.txt",
   test_only_unsigned_payload: true,
 }
 
@@ -235,7 +235,7 @@
   key: "com.android.apex.cts.shim.key",
   prebuilts: ["hash_v1"],
   apps: ["CtsShim", "CtsShimPriv"],
-  whitelisted_files: "default_shim_whitelist.txt",
+  allowed_files: "default_shim_allowed_list.txt",
 }
 
 genrule {
@@ -430,7 +430,7 @@
 }
 
 // This one is only used in ApexdHostTest and not meant to be installed
-// and hence shouldn't be whitelisted in hash.txt of v1 shim APEX.
+// and hence shouldn't be allowed in hash.txt of v1 shim APEX.
 apex {
   name: "com.android.apex.cts.shim.v2_legacy",
   manifest: "manifest_v2.json",

shim/build/default_shim_allowed_list.txt

diff --git a/shim/build/default_shim_whitelist.txt b/shim/build/default_shim_allowed_list.txt
similarity index 100%
rename from shim/build/default_shim_whitelist.txt
rename to shim/build/default_shim_allowed_list.txt

tools/update_allowed_list.sh

diff --git a/tools/update_whitelist.sh b/tools/update_allowed_list.sh
similarity index 77%
rename from tools/update_whitelist.sh
rename to tools/update_allowed_list.sh
index d963d6f..c345300 100755
--- a/tools/update_whitelist.sh
+++ b/tools/update_allowed_list.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 usage () {
-  echo "Usage: $0 apex_whitelist_file apex_contents_file"
+  echo "Usage: $0 apex_allowed_list_file apex_contents_file"
 }
 
 if [[ $# -ne 2 ]]; then