From 7cebdeeb53410548c2fad979b46f94d4e53c9733 Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Fri, 7 Aug 2020 15:44:46 +0100
Subject: profman: inclusive language updates

Based on:
  https://source.android.com/setup/contribute/respectful-code

Bug: 161336379
Bug: 161896447
Test: m
Change-Id: Iaf7db2f76d8979f1ccc06c7e9e705b69c1f8069d
---
 config/Android.bp                    | 4 ++--
 config/generate-preloaded-classes.sh | 6 +++---
 config/preloaded-classes-blacklist   | 8 --------
 config/preloaded-classes-denylist    | 8 ++++++++
 4 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 config/preloaded-classes-blacklist
 create mode 100644 config/preloaded-classes-denylist

(limited to 'config')

diff --git a/config/Android.bp b/config/Android.bp
index 0fb56cb3410a..8dd409b51eee 100644
--- a/config/Android.bp
+++ b/config/Android.bp
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 filegroup {
-    name: "preloaded-classes-blacklist",
-    srcs: ["preloaded-classes-blacklist"],
+    name: "preloaded-classes-denylist",
+    srcs: ["preloaded-classes-denylist"],
 }
diff --git a/config/generate-preloaded-classes.sh b/config/generate-preloaded-classes.sh
index 0ad3a0263d95..b17a3660e1f1 100755
--- a/config/generate-preloaded-classes.sh
+++ b/config/generate-preloaded-classes.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 if [ "$#" -lt 2 ]; then
-  echo "Usage $0 <input classes file> <blacklist file> [extra classes files]"
+  echo "Usage $0 <input classes file> <denylist file> [extra classes files]"
   exit 1
 fi
 
@@ -31,9 +31,9 @@ echo "# Preloaded-classes filter file for phones.
 #"
 
 input=$1
-blacklist=$2
+denylist=$2
 shift 2
 extra_classes_files=("$@")
 
 # Disable locale to enable lexicographical sorting
-LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$blacklist" -v -F -x | grep -v "\$NoPreloadHolder"
+LC_ALL=C sort "$input" "${extra_classes_files[@]}" | uniq | grep -f "$denylist" -v -F -x | grep -v "\$NoPreloadHolder"
diff --git a/config/preloaded-classes-blacklist b/config/preloaded-classes-blacklist
deleted file mode 100644
index 48d579cc118e..000000000000
--- a/config/preloaded-classes-blacklist
+++ /dev/null
@@ -1,8 +0,0 @@
-android.content.AsyncTaskLoader$LoadTask
-android.net.ConnectivityThread$Singleton
-android.os.AsyncTask
-android.os.FileObserver
-android.os.NullVibrator
-android.speech.tts.TextToSpeech$Connection$SetupConnectionAsyncTask
-android.widget.Magnifier
-com.android.server.BootReceiver$2
diff --git a/config/preloaded-classes-denylist b/config/preloaded-classes-denylist
new file mode 100644
index 000000000000..48d579cc118e
--- /dev/null
+++ b/config/preloaded-classes-denylist
@@ -0,0 +1,8 @@
+android.content.AsyncTaskLoader$LoadTask
+android.net.ConnectivityThread$Singleton
+android.os.AsyncTask
+android.os.FileObserver
+android.os.NullVibrator
+android.speech.tts.TextToSpeech$Connection$SetupConnectionAsyncTask
+android.widget.Magnifier
+com.android.server.BootReceiver$2
-- 
cgit v1.2.3