diff options
author | Christofer Ã…kersten <akersten@google.com> | 2020-07-30 21:26:11 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-30 21:26:11 +0000 |
commit | aeec9f0983c42dcb641ce68e4a0edf1acea94ed4 (patch) | |
tree | 48435fffd083ff1f92dd41bfb1a497df91ce9429 /src/com | |
parent | 8586642a497f5ab8de987e7e6dfc7b6605dc9fc8 (diff) | |
parent | cb1e9342eefc7a7a7a2d3c7fb7b76d671804c3d4 (diff) | |
download | TV-aeec9f0983c42dcb641ce68e4a0edf1acea94ed4.tar.gz |
Merge "Update language to comply with Android's inclusive language guidance"
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/tv/SetupPassthroughActivity.java | 6 | ||||
-rw-r--r-- | src/com/android/tv/data/epg/EpgFetcherImpl.java | 12 | ||||
-rw-r--r-- | src/com/android/tv/data/epg/EpgInputAllowList.java (renamed from src/com/android/tv/data/epg/EpgInputWhiteList.java) | 30 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/com/android/tv/SetupPassthroughActivity.java b/src/com/android/tv/SetupPassthroughActivity.java index 25049f1d..98f9b809 100644 --- a/src/com/android/tv/SetupPassthroughActivity.java +++ b/src/com/android/tv/SetupPassthroughActivity.java @@ -33,7 +33,7 @@ import com.android.tv.common.actions.InputSetupActionUtils; import com.android.tv.data.ChannelDataManager; import com.android.tv.data.ChannelDataManager.Listener; import com.android.tv.data.epg.EpgFetcher; -import com.android.tv.data.epg.EpgInputWhiteList; +import com.android.tv.data.epg.EpgInputAllowList; import com.android.tv.features.TvFeatures; import com.android.tv.util.SetupUtils; import com.android.tv.util.TvInputManagerHelper; @@ -64,7 +64,7 @@ public class SetupPassthroughActivity extends Activity { private TvInputInfo mTvInputInfo; private Intent mActivityAfterCompletion; private boolean mEpgFetcherDuringScan; - @Inject EpgInputWhiteList mEpgInputWhiteList; + @Inject EpgInputAllowList mEpgInputAllowList; @Inject TvInputManagerHelper mInputManager; @Inject SetupUtils mSetupUtils; @Inject ChannelDataManager mChannelDataManager; @@ -169,7 +169,7 @@ public class SetupPassthroughActivity extends Activity { && data.getBooleanExtra(EpgContract.EXTRA_USE_CLOUD_EPG, false)) { if (DEBUG) Log.d(TAG, "extra " + data.getExtras()); String inputId = data.getStringExtra(TvInputInfo.EXTRA_INPUT_ID); - if (mEpgInputWhiteList.isInputWhiteListed(inputId)) { + if (mEpgInputAllowList.isInputAllowed(inputId)) { mEpgFetcher.fetchImmediately(); } } diff --git a/src/com/android/tv/data/epg/EpgFetcherImpl.java b/src/com/android/tv/data/epg/EpgFetcherImpl.java index 27d7f8d5..b62efbe1 100644 --- a/src/com/android/tv/data/epg/EpgFetcherImpl.java +++ b/src/com/android/tv/data/epg/EpgFetcherImpl.java @@ -124,7 +124,7 @@ public class EpgFetcherImpl implements EpgFetcher { private final ChannelDataManager mChannelDataManager; private final EpgReader mEpgReader; private final PerformanceMonitor mPerformanceMonitor; - private final EpgInputWhiteList mEpgInputWhiteList; + private final EpgInputAllowList mEpgInputAllowList; private final BackendKnobsFlags mBackendKnobsFlags; private final HasBuildType.BuildType mBuildType; private FetchAsyncTask mFetchTask; @@ -141,7 +141,7 @@ public class EpgFetcherImpl implements EpgFetcher { @Inject public EpgFetcherImpl( @ApplicationContext Context context, - EpgInputWhiteList epgInputWhiteList, + EpgInputAllowList epgInputAllowList, ChannelDataManager channelDataManager, EpgReader epgReader, PerformanceMonitor performanceMonitor, @@ -153,7 +153,7 @@ public class EpgFetcherImpl implements EpgFetcher { mEpgReader = epgReader; mPerformanceMonitor = performanceMonitor; mClock = clock; - mEpgInputWhiteList = epgInputWhiteList; + mEpgInputAllowList = epgInputAllowList; mBackendKnobsFlags = backendKnobsFlags; mBuildType = buildType; } @@ -516,7 +516,7 @@ public class EpgFetcherImpl implements EpgFetcher { return numbers.size(); } - private boolean isInputInWhiteList(EpgInput epgInput) { + private boolean isInputAllowed(EpgInput epgInput) { if (mBuildType == HasBuildType.BuildType.AOSP) { return false; } @@ -524,7 +524,7 @@ public class EpgFetcherImpl implements EpgFetcher { && epgInput.getInputId() .equals( "com.example.partnersupportsampletvinput/.SampleTvInputService")) - || mEpgInputWhiteList.isInputWhiteListed(epgInput.getInputId()); + || mEpgInputAllowList.isInputAllowed(epgInput.getInputId()); } @VisibleForTesting @@ -561,7 +561,7 @@ public class EpgFetcherImpl implements EpgFetcher { if (isCancelled()) { break; } - if (isInputInWhiteList(epgInput)) { + if (isInputAllowed(epgInput)) { // TODO(b/66191312) check timestamp and result code and decide if update // is needed. Set<Channel> channels = getExistingChannelsFor(epgInput.getInputId()); diff --git a/src/com/android/tv/data/epg/EpgInputWhiteList.java b/src/com/android/tv/data/epg/EpgInputAllowList.java index 5f4219f2..7ef52f8b 100644 --- a/src/com/android/tv/data/epg/EpgInputWhiteList.java +++ b/src/com/android/tv/data/epg/EpgInputAllowList.java @@ -31,10 +31,10 @@ import java.util.List; import javax.inject.Inject; -/** Checks if a package or a input is white listed. */ -public final class EpgInputWhiteList { +/** Checks if a package or a input is allowed. */ +public final class EpgInputAllowList { private static final boolean DEBUG = false; - private static final String TAG = "EpgInputWhiteList"; + private static final String TAG = "EpgInputAllowList"; private static final ImmutableSet<String> QA_DEV_INPUTS = ImmutableSet.of( "com.example.partnersupportsampletvinput/.SampleTvInputService", @@ -50,33 +50,33 @@ public final class EpgInputWhiteList { private final CloudEpgFlags mCloudEpgFlags; @Inject - public EpgInputWhiteList(CloudEpgFlags cloudEpgFlags, LegacyFlags legacyFlags) { + public EpgInputAllowList(CloudEpgFlags cloudEpgFlags, LegacyFlags legacyFlags) { mCloudEpgFlags = cloudEpgFlags; mLegacyFlags = legacyFlags; } - public boolean isInputWhiteListed(String inputId) { - return getWhiteListedInputs().contains(inputId); + public boolean isInputAllowed(String inputId) { + return getAllowedInputs().contains(inputId); } - public boolean isPackageWhiteListed(String packageName) { - if (DEBUG) Log.d(TAG, "isPackageWhiteListed " + packageName); - ImmutableSet<String> whiteList = getWhiteListedInputs(); - for (String good : whiteList) { + public boolean isPackageAllowed(String packageName) { + if (DEBUG) Log.d(TAG, "isPackageAllowed " + packageName); + ImmutableSet<String> allowedInputs = getAllowedInputs(); + for (String allowed : allowedInputs) { try { - String goodPackage = getPackageFromInput(good); - if (goodPackage.equals(packageName)) { + String allowedPackage = getPackageFromInput(allowed); + if (allowedPackage.equals(packageName)) { return true; } } catch (Exception e) { - if (DEBUG) Log.d(TAG, "Error parsing package name of " + good, e); + if (DEBUG) Log.d(TAG, "Error parsing package name of " + allowed, e); continue; } } return false; } - private ImmutableSet<String> getWhiteListedInputs() { + private ImmutableSet<String> getAllowedInputs() { ImmutableSet<String> result = toInputSet(mCloudEpgFlags.thirdPartyEpgInputs().getElementList()); if (BuildConfig.ENG || mLegacyFlags.enableQaFeatures()) { @@ -87,7 +87,7 @@ public final class EpgInputWhiteList { ImmutableSet.<String>builder().addAll(result).addAll(QA_DEV_INPUTS).build(); } } - if (DEBUG) Log.d(TAG, "getWhiteListedInputs " + result); + if (DEBUG) Log.d(TAG, "getAllowedInputs " + result); return result; } |