1 files changed, 15 insertions, 5 deletions
diff --git a/src/com/android/tv/guide/ProgramManager.java b/src/com/android/tv/guide/ProgramManager.java
index e3d919df..e543fd05 100644
--- a/src/com/android/tv/guide/ProgramManager.java
+++ b/src/com/android/tv/guide/ProgramManager.java
@@ -29,7 +29,7 @@ import com.android.tv.data.ProgramDataManager;
 import com.android.tv.dvr.DvrDataManager;
 import com.android.tv.dvr.DvrScheduleManager;
 import com.android.tv.dvr.DvrScheduleManager.OnConflictStateChangeListener;
-import com.android.tv.dvr.ScheduledRecording;
+import com.android.tv.dvr.data.ScheduledRecording;
 import com.android.tv.util.TvInputManagerHelper;
 import com.android.tv.util.Utils;
 
@@ -439,11 +439,24 @@ public class ProgramManager {
         mChannels = mChannelDataManager.getBrowsableChannelList();
         mSelectedGenreId = GenreItems.ID_ALL_CHANNELS;
         mFilteredChannels = mChannels;
+        updateTableEntriesWithoutNotification(clearPreviousTableEntries);
+        // Channel update notification should be called after updating table entries, so that
+        // the listener can get the entries.
         notifyChannelsUpdated();
-        updateTableEntries(clearPreviousTableEntries);
+        notifyTableEntriesUpdated();
+        buildGenreFilters();
     }
 
     private void updateTableEntries(boolean clear) {
+        updateTableEntriesWithoutNotification(clear);
+        notifyTableEntriesUpdated();
+        buildGenreFilters();
+    }
+
+    /**
+     * Updates the table entries without notifying the change.
+     */
+    private void updateTableEntriesWithoutNotification(boolean clear) {
         if (clear) {
             mChannelIdEntriesMap.clear();
         }
@@ -491,9 +504,6 @@ public class ProgramManager {
                 }
             }
         }
-
-        notifyTableEntriesUpdated();
-        buildGenreFilters();
     }
 
     private void notifyGenresUpdated() {