diff options
| author | nchalko <nchalko@google.com> | 2018-03-17 22:04:53 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2018-03-20 08:23:24 -0700 |
| commit | 9c76b46b7fb46cee79e8549a92f0da0e8f2910b2 (patch) | |
| tree | b1d109a9608d6a2864eceaee23ced25d18c00cd9 /partner_support | |
| parent | e6f0efaebefeb39d92873ffbec82e63c2a39c8ed (diff) | |
| download | TV-9c76b46b7fb46cee79e8549a92f0da0e8f2910b2.tar.gz | |
CLEANUP: Remove stripping of AutoValue from aosp master
PiperOrigin-RevId: 189484262
Change-Id: Id50dfc8fd231586e84b2a47aa0992904ab5ea834
Diffstat (limited to 'partner_support')
| -rw-r--r-- | partner_support/src/com/google/android/tv/partner/support/EpgInput.java | 5 | ||||
| -rw-r--r-- | partner_support/src/com/google/android/tv/partner/support/Lineup.java | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/partner_support/src/com/google/android/tv/partner/support/EpgInput.java b/partner_support/src/com/google/android/tv/partner/support/EpgInput.java index f838be0a..20b3542a 100644 --- a/partner_support/src/com/google/android/tv/partner/support/EpgInput.java +++ b/partner_support/src/com/google/android/tv/partner/support/EpgInput.java @@ -17,15 +17,14 @@ package com.google.android.tv.partner.support; import android.content.ContentValues; -import com.google.auto.value.AutoValue; // AOSP_MASTER:strip_line +import com.google.auto.value.AutoValue; /** * Value class representing a TV Input that uses Live TV EPG. * * @see {@link EpgContract.EpgInputs} */ -// TODO(b/72052568): Get autovalue to work in aosp master -@AutoValue // AOSP_MASTER:strip_line +@AutoValue public abstract class EpgInput { public static EpgInput createEpgChannel(long id, String inputId, String lineupId) { diff --git a/partner_support/src/com/google/android/tv/partner/support/Lineup.java b/partner_support/src/com/google/android/tv/partner/support/Lineup.java index 9bad279f..c5d30464 100644 --- a/partner_support/src/com/google/android/tv/partner/support/Lineup.java +++ b/partner_support/src/com/google/android/tv/partner/support/Lineup.java @@ -18,14 +18,13 @@ package com.google.android.tv.partner.support; import android.content.ContentValues; import android.support.annotation.Nullable; -import com.google.auto.value.AutoValue; // AOSP_MASTER:strip_line +import com.google.auto.value.AutoValue; import java.util.ArrayList; import java.util.Collections; import java.util.List; /** Value class for {@link com.google.android.tv.partner.support.EpgContract.Lineups} */ -// TODO(b/72052568): Get autovalue to work in aosp master -@AutoValue // AOSP_MASTER:strip_line +@AutoValue public abstract class Lineup { /** Lineup type for cable. */ public static final int LINEUP_CABLE = 0; |