diff options
Diffstat (limited to 'src/com/android/tv/data')
| -rw-r--r-- | src/com/android/tv/data/ProgramDataManager.java | 18 | ||||
| -rw-r--r-- | src/com/android/tv/data/ProgramImpl.java | 4 | ||||
| -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 |
4 files changed, 32 insertions, 32 deletions
diff --git a/src/com/android/tv/data/ProgramDataManager.java b/src/com/android/tv/data/ProgramDataManager.java index a866c78e..dcfa69e2 100644 --- a/src/com/android/tv/data/ProgramDataManager.java +++ b/src/com/android/tv/data/ProgramDataManager.java @@ -402,7 +402,7 @@ public class ProgramDataManager implements MemoryManageable { * * <p>Prefetch should be enabled to call it. * - * @return {@link List} with Programs. It may includes dummy program if the entry needs DB + * @return {@link List} with Programs. It may includes stub program if the entry needs DB * operations to get. */ public List<Program> getPrograms(long channelId, long startTime) { @@ -425,7 +425,7 @@ public class ProgramDataManager implements MemoryManageable { private int getProgramIndexAt(List<Program> programs, long time) { Program key = mZeroLengthProgramCache.get(time); if (key == null) { - key = createDummyProgram(time, time); + key = createStubProgram(time, time); mZeroLengthProgramCache.put(time, key); } int index = Collections.binarySearch(programs, key); @@ -527,11 +527,11 @@ public class ProgramDataManager implements MemoryManageable { continue; } - // Update dummy program around current program if any. + // Update stub program around current program if any. if (cachedProgram.getStartTimeUtcMillis() < currentProgram.getStartTimeUtcMillis()) { - // The dummy program starts earlier than the current program. Adjust its end time. + // The stub program starts earlier than the current program. Adjust its end time. i.set( - createDummyProgram( + createStubProgram( cachedProgram.getStartTimeUtcMillis(), currentProgram.getStartTimeUtcMillis())); i.add(currentProgram); @@ -539,9 +539,9 @@ public class ProgramDataManager implements MemoryManageable { i.set(currentProgram); } if (currentProgram.getEndTimeUtcMillis() < cachedProgram.getEndTimeUtcMillis()) { - // The dummy program ends later than the current program. Adjust its start time. + // The stub program ends later than the current program. Adjust its start time. i.add( - createDummyProgram( + createStubProgram( currentProgram.getEndTimeUtcMillis(), cachedProgram.getEndTimeUtcMillis())); } @@ -1010,8 +1010,8 @@ public class ProgramDataManager implements MemoryManageable { } } - // Create dummy program which indicates data isn't loaded yet so DB query is required. - private Program createDummyProgram(long startTimeMs, long endTimeMs) { + // Create stub program which indicates data isn't loaded yet so DB query is required. + private Program createStubProgram(long startTimeMs, long endTimeMs) { return new ProgramImpl.Builder() .setChannelId(Channel.INVALID_ID) .setStartTimeUtcMillis(startTimeMs) diff --git a/src/com/android/tv/data/ProgramImpl.java b/src/com/android/tv/data/ProgramImpl.java index 5097e2d4..84e42fbe 100644 --- a/src/com/android/tv/data/ProgramImpl.java +++ b/src/com/android/tv/data/ProgramImpl.java @@ -419,7 +419,7 @@ public final class ProgramImpl extends BaseProgramImpl implements Parcelable, Pr @Override public int hashCode() { - // Hash with all the properties because program ID can be invalid for the dummy programs. + // Hash with all the properties because program ID can be invalid for the stub programs. return Objects.hash( mChannelId, mStartTimeUtcMillis, @@ -446,7 +446,7 @@ public final class ProgramImpl extends BaseProgramImpl implements Parcelable, Pr if (!(other instanceof ProgramImpl)) { return false; } - // Compare all the properties because program ID can be invalid for the dummy programs. + // Compare all the properties because program ID can be invalid for the stub programs. ProgramImpl program = (ProgramImpl) other; return Objects.equals(mPackageName, program.mPackageName) && mChannelId == program.mChannelId 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; } |