Revert "Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2"

This reverts commit 3dfa929b24f38ac7836450176d88ceab41dc6ac5.

Change-Id: I1c76f626d966b8d4793a19677a8840ed0424d3a7

1 files changed, 6 insertions, 23 deletions

diff --git a/src/com/android/tv/data/epg/EpgReader.java b/src/com/android/tv/data/epg/EpgReader.java
index 95cd933e..4f3b6f52 100644
--- a/src/com/android/tv/data/epg/EpgReader.java
+++ b/src/com/android/tv/data/epg/EpgReader.java
@@ -22,10 +22,9 @@ import android.support.annotation.WorkerThread;
 import com.android.tv.data.Channel;
 import com.android.tv.data.Lineup;
 import com.android.tv.data.Program;
-import com.android.tv.dvr.data.SeriesInfo;
+import com.android.tv.dvr.SeriesInfo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * An interface used to retrieve the EPG data. This class should be used in worker thread.
@@ -44,37 +43,21 @@ public interface EpgReader {
     long getEpgTimestamp();
 
     /**
-     * Returns the lineups list.
-     */
-    List<Lineup> getLineups(@NonNull String postalCode);
-
-    /**
-     * Returns the list of channel numbers (unsorted) for the given lineup. The result is used to
-     * choose the most appropriate lineup among others by comparing the channel numbers of the
-     * existing channels on the device.
-     */
-    List<String> getChannelNumbers(@NonNull String lineupId);
-
-    /**
-     * Returns the list of channels for the given lineup. The returned channels should map into the
-     * existing channels on the device. This method is usually called after selecting the lineup.
+     * Returns the channels list.
      */
     List<Channel> getChannels(@NonNull String lineupId);
 
     /**
-     * Returns the programs for the given channel. Must call {@link #getChannels(String)}
-     * beforehand. Note that the {@code Program} doesn't have valid program ID because it's not
-     * retrieved from TvProvider.
+     * Returns the lineups list.
      */
-    List<Program> getPrograms(long channelId);
+    List<Lineup> getLineups(@NonNull String postalCode);
 
     /**
-     * Returns the programs for the given channels.
+     * Returns the programs for the given channel. The result is sorted by the start time.
      * Note that the {@code Program} doesn't have valid program ID because it's not retrieved from
      * TvProvider.
-     * This method is only used to get programs for a short duration typically.
      */
-    Map<Long, List<Program>> getPrograms(List<Long> channelIds, long duration);
+    List<Program> getPrograms(long channelId);
 
     /**
      * Returns the series information for the given series ID.