diff options
author | Christofer Ã…kersten <akersten@google.com> | 2020-07-30 22:25:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-30 22:25:22 +0000 |
commit | e7ecec0c21b3248b827625530d44b1221e3ecec5 (patch) | |
tree | de00e14310a2f21eb53612820685eefdd4295bdd /src/com | |
parent | e4ff74fe0ab99b19a1b9c845603a2ebac9968484 (diff) | |
parent | 6dfb779bc228947e375b7b3ca2f617a884942703 (diff) | |
download | TV-e7ecec0c21b3248b827625530d44b1221e3ecec5.tar.gz |
Merge "Update language to comply with Android's inclusive language guidance" am: aceffb938a am: 6dfb779bc2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1380000
Change-Id: I38c633ba253a36736b96e2b27c657583c9cceaa4
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/tv/features/TvFeatures.java | 2 | ||||
-rw-r--r-- | src/com/android/tv/util/TvInputManagerHelper.java | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/tv/features/TvFeatures.java b/src/com/android/tv/features/TvFeatures.java index a18d9c89..3075c225 100644 --- a/src/com/android/tv/features/TvFeatures.java +++ b/src/com/android/tv/features/TvFeatures.java @@ -99,7 +99,7 @@ public final class TvFeatures extends CommonFeatures { public static final Feature SHOW_UPCOMING_CONFLICT_DIALOG = OFF; /** Use input blacklist to disable partner's tuner input. */ - public static final Feature USE_PARTNER_INPUT_BLACKLIST = ON; + public static final Feature USE_PARTNER_INPUT_BLOCKLIST = ON; private TvFeatures() {} } diff --git a/src/com/android/tv/util/TvInputManagerHelper.java b/src/com/android/tv/util/TvInputManagerHelper.java index 23c9b494..72d527a9 100644 --- a/src/com/android/tv/util/TvInputManagerHelper.java +++ b/src/com/android/tv/util/TvInputManagerHelper.java @@ -128,14 +128,14 @@ public class TvInputManagerHelper { private static final String PERMISSION_ACCESS_ALL_EPG_DATA = "com.android.providers.tv.permission.ACCESS_ALL_EPG_DATA"; - private static final String[] mPhysicalTunerBlackList = { + private static final String[] mPhysicalTunerBlockList = { "com.google.android.videos", // Play Movies }; private static final String META_LABEL_SORT_KEY = "input_sort_key"; private static final String TV_INPUT_ALLOW_3RD_PARTY_INPUTS = "tv_input_allow_3rd_party_inputs"; - private static final String[] SYSTEM_INPUT_ID_BLACKLIST = { + private static final String[] SYSTEM_INPUT_ID_BLOCKLIST = { "com.google.android.videos/" // Play Movies }; @@ -160,7 +160,7 @@ public class TvInputManagerHelper { DEFAULT_TV_INPUT_PRIORITY.add(TvInputInfo.TYPE_OTHER); } - private static final String[] PARTNER_TUNER_INPUT_PREFIX_BLACKLIST = { + private static final String[] PARTNER_TUNER_INPUT_PREFIX_BLOCKLIST = { /* Begin_AOSP_Comment_Out // Disabled partner's tuner input prefix list. "com.mediatek.tvinput/.dtv" @@ -597,7 +597,7 @@ public class TvInputManagerHelper { private boolean isInputPhysicalTuner(TvInputInfo input) { String packageName = input.getServiceInfo().packageName; - if (Arrays.asList(mPhysicalTunerBlackList).contains(packageName)) { + if (Arrays.asList(mPhysicalTunerBlockList).contains(packageName)) { return false; } @@ -628,9 +628,9 @@ public class TvInputManagerHelper { return true; } - private boolean isInBlackList(String inputId) { - if (TvFeatures.USE_PARTNER_INPUT_BLACKLIST.isEnabled(mContext)) { - for (String disabledTunerInputPrefix : PARTNER_TUNER_INPUT_PREFIX_BLACKLIST) { + private boolean isBlocked(String inputId) { + if (TvFeatures.USE_PARTNER_INPUT_BLOCKLIST.isEnabled(mContext)) { + for (String disabledTunerInputPrefix : PARTNER_TUNER_INPUT_PREFIX_BLOCKLIST) { if (inputId.contains(disabledTunerInputPrefix)) { return true; } @@ -694,13 +694,13 @@ public class TvInputManagerHelper { if (!isSystemInput(info)) { return true; } - for (String id : SYSTEM_INPUT_ID_BLACKLIST) { + for (String id : SYSTEM_INPUT_ID_BLOCKLIST) { if (info.getId().startsWith(id)) { return true; } } } - return isInBlackList(info.getId()); + return isBlocked(info.getId()); } /** |