aboutsummaryrefslogtreecommitdiff
path: root/src/com
diff options
context:
space:
mode:
authorChristofer Ã…kersten <akersten@google.com>2020-08-03 18:40:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-03 18:40:00 +0000
commit14545842b442f074d9580eece3fb19cecd39ee15 (patch)
tree3bf930b1dd5388bfcc9962a9328b868f9808c1bd /src/com
parent574dd1d7a3ef2980d27911cb598f0af59a85c314 (diff)
parentdcfae2e59a3fccc73f8c264e0f66ebcc7a276409 (diff)
downloadTV-14545842b442f074d9580eece3fb19cecd39ee15.tar.gz
Update language to comply with Android's inclusive language guidance am: fb7246840f am: dcfae2e59a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1385535 Change-Id: Ib7e7de17ede36473db2b5b54037732d96d3ed4e5
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/tv/features/TvFeatures.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/tv/features/TvFeatures.java b/src/com/android/tv/features/TvFeatures.java
index 3075c225..5282c28c 100644
--- a/src/com/android/tv/features/TvFeatures.java
+++ b/src/com/android/tv/features/TvFeatures.java
@@ -98,7 +98,7 @@ public final class TvFeatures extends CommonFeatures {
/** Enable a conflict dialog between currently watched channel and upcoming recording. */
public static final Feature SHOW_UPCOMING_CONFLICT_DIALOG = OFF;
- /** Use input blacklist to disable partner's tuner input. */
+ /** Use input blocklist to disable partner's tuner input. */
public static final Feature USE_PARTNER_INPUT_BLOCKLIST = ON;
private TvFeatures() {}