Snap for 8564071 from 92f369e880de8a5c063869e790547911a767a84b to mainline-conscrypt-releaseaml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android13-mainline-conscrypt-release

Change-Id: I36eade25efd3bd046053a9095e515096556a507a

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);