Fix broken build

This reverts

c9889d1 Update aosp build to use a snapshot of exoplyer. by nchalko · 5
hours ago master
8952aa7 Clean format by nchalko · 20 hours ago
ba3fb16 Merge "Use a snapshot of exoplayer" by TreeHugger Robot · 18
hours ago
ff75e39 Project import generated by Copybara. by Live Channels Team · 22
hours ago
9737fc2 Use a snapshot of exoplayer by Nick Chalko · 20 hours ago
4a5144a Project import generated by Copybara. by Live Channels Team · 6
days ago

Bug: 72092981
Bug: 69474774
Change-Id: Ie756857c10bf052c60b6442c3d61252f65b49143

1 files changed, 11 insertions, 42 deletions

diff --git a/src/com/android/tv/data/Lineup.java b/src/com/android/tv/data/Lineup.java
index 4393cd3d..0f11c1cc 100644
--- a/src/com/android/tv/data/Lineup.java
+++ b/src/com/android/tv/data/Lineup.java
@@ -19,45 +19,23 @@ package com.android.tv.data;
 import android.support.annotation.IntDef;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Collections;
-import java.util.List;
 
 /** A class that represents a lineup. */
 public class Lineup {
     /** The ID of this lineup. */
-    public String getId() {
-        return id;
-    }
+    public final String id;
 
     /** The type associated with this lineup. */
-    public int getType() {
-        return type;
-    }
-
-    /** The human readable name associated with this lineup. */
-    public String getName() {
-        return name;
-    }
+    public final int type;
 
     /** The human readable name associated with this lineup. */
-    public String getLocation() {
-        return location;
-    }
-
-    /** An unmodifiable list of channel numbers that this lineup has. */
-    public List<String> getChannels() {
-        return channels;
-    }
+    public final String name;
 
-    private final String id;
-
-    private final int type;
-
-    private final String name;
-
-    private final String location;
-
-    private final List<String> channels;
+    /**
+     * Location this lineup can be found. This is a human readable description of a geographic
+     * location.
+     */
+    public final String location;
 
     @Retention(RetentionPolicy.SOURCE)
     @IntDef({
@@ -66,9 +44,7 @@ public class Lineup {
         LINEUP_BROADCAST_DIGITAL,
         LINEUP_BROADCAST_ANALOG,
         LINEUP_IPTV,
-        LINEUP_MVPD,
-        LINEUP_INTERNET,
-        LINEUP_OTHER
+        LINEUP_MVPD
     })
     public @interface LineupType {}
 
@@ -88,23 +64,16 @@ public class Lineup {
     public static final int LINEUP_IPTV = 4;
 
     /**
-     * Indicates the lineup is either satellite, cable or IPTV but we are not sure which specific
+     * Indicates the lineup is either satelite, cable or IPTV but we are not sure which specific
      * type.
      */
     public static final int LINEUP_MVPD = 5;
 
-    /** Lineup type for Internet. */
-    public static final int LINEUP_INTERNET = 6;
-
-    /** Lineup type for other. */
-    public static final int LINEUP_OTHER = 7;
-
     /** Creates a lineup. */
-    public Lineup(String id, int type, String name, String location, List<String> channels) {
+    public Lineup(String id, int type, String name, String location) {
         this.id = id;
         this.type = type;
         this.name = name;
         this.location = location;
-        this.channels = Collections.unmodifiableList(channels);
     }
 }