diff options
author | Christofer Ã…kersten <akersten@google.com> | 2020-07-30 22:24:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-30 22:24:35 +0000 |
commit | 3c4ea21cdff07a01c02f4837e96fa20272ec6ea0 (patch) | |
tree | ae51e8a51f3838c5c20c1c57213b5939591d8b43 /src/com/android | |
parent | 885c7df4607372594231a9b1369e6bfbf9b346a0 (diff) | |
parent | 272995c2902a568798b7271a9f00f205902af647 (diff) | |
download | TV-3c4ea21cdff07a01c02f4837e96fa20272ec6ea0.tar.gz |
Merge "Update language to comply with Android's inclusive language guidance" am: dbbf89dab2 am: 272995c290
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1380001
Change-Id: Ib49010b28b1a8f473b45d1f2077b72bd218821a5
Diffstat (limited to 'src/com/android')
-rw-r--r-- | src/com/android/tv/guide/ProgramManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/tv/guide/ProgramManager.java b/src/com/android/tv/guide/ProgramManager.java index 516a4d9c..9dfc05c0 100644 --- a/src/com/android/tv/guide/ProgramManager.java +++ b/src/com/android/tv/guide/ProgramManager.java @@ -417,8 +417,9 @@ public class ProgramManager { /** * Returns an entry as {@link ProgramImpl} for a given {@code channelId} and {@code index} of - * entries within the currently managed time range. Returned {@link ProgramImpl} can be a dummy - * one (e.g., whose channelId is INVALID_ID), when it corresponds to a gap between programs. + * entries within the currently managed time range. Returned {@link ProgramImpl} can be a + * placeholder (e.g., whose channelId is INVALID_ID), when it corresponds to a gap between + * programs. */ TableEntry getTableEntry(long channelId, int index) { mProgramDataManager.prefetchChannel(channelId, index); @@ -613,7 +614,7 @@ public class ProgramManager { List<Program> programs = mProgramDataManager.getPrograms(channelId, mStartUtcMillis); for (Program program : programs) { if (program.getChannelId() == INVALID_ID) { - // Dummy program. + // Placeholder program. continue; } long programStartTime = Math.max(program.getStartTimeUtcMillis(), mStartUtcMillis); |