diff options
| author | Youngsang Cho <youngsang@google.com> | 2016-10-31 15:28:42 -0700 |
|---|---|---|
| committer | Youngsang Cho <youngsang@google.com> | 2016-10-31 15:28:42 -0700 |
| commit | 919e1ed7e914029a1a0054237d86dc7b19ced898 (patch) | |
| tree | cb30cfbafd80e01d314868cdc36e783d39981119 /tests/common/src/com/android/tv/testing/ChannelUtils.java | |
| parent | 2933fcfd17f59c086436b270e7c01f2afcd54aa5 (diff) | |
| download | TV-919e1ed7e914029a1a0054237d86dc7b19ced898.tar.gz | |
Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33
Change-Id: I873644d6d9d0110c981ef6075cb4019c16bbb94b
Diffstat (limited to 'tests/common/src/com/android/tv/testing/ChannelUtils.java')
| -rw-r--r-- | tests/common/src/com/android/tv/testing/ChannelUtils.java | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/tests/common/src/com/android/tv/testing/ChannelUtils.java b/tests/common/src/com/android/tv/testing/ChannelUtils.java index e09843a6..bfb766d6 100644 --- a/tests/common/src/com/android/tv/testing/ChannelUtils.java +++ b/tests/common/src/com/android/tv/testing/ChannelUtils.java @@ -23,7 +23,6 @@ import android.media.tv.TvContract; import android.media.tv.TvContract.Channels; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.support.annotation.WorkerThread; import android.text.TextUtils; import android.util.Log; @@ -96,22 +95,20 @@ public class ChannelUtils { } else { values.putNull(Channels.COLUMN_VIDEO_FORMAT); } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (!TextUtils.isEmpty(channel.appLinkText)) { - values.put(Channels.COLUMN_APP_LINK_TEXT, channel.appLinkText); - } - if (channel.appLinkColor != 0) { - values.put(Channels.COLUMN_APP_LINK_COLOR, channel.appLinkColor); - } - if (!TextUtils.isEmpty(channel.appLinkPosterArtUri)) { - values.put(Channels.COLUMN_APP_LINK_POSTER_ART_URI, channel.appLinkPosterArtUri); - } - if (!TextUtils.isEmpty(channel.appLinkIconUri)) { - values.put(Channels.COLUMN_APP_LINK_ICON_URI, channel.appLinkIconUri); - } - if (!TextUtils.isEmpty(channel.appLinkIntentUri)) { - values.put(Channels.COLUMN_APP_LINK_INTENT_URI, channel.appLinkIntentUri); - } + if (!TextUtils.isEmpty(channel.appLinkText)) { + values.put(Channels.COLUMN_APP_LINK_TEXT, channel.appLinkText); + } + if (channel.appLinkColor != 0) { + values.put(Channels.COLUMN_APP_LINK_COLOR, channel.appLinkColor); + } + if (!TextUtils.isEmpty(channel.appLinkPosterArtUri)) { + values.put(Channels.COLUMN_APP_LINK_POSTER_ART_URI, channel.appLinkPosterArtUri); + } + if (!TextUtils.isEmpty(channel.appLinkIconUri)) { + values.put(Channels.COLUMN_APP_LINK_ICON_URI, channel.appLinkIconUri); + } + if (!TextUtils.isEmpty(channel.appLinkIntentUri)) { + values.put(Channels.COLUMN_APP_LINK_INTENT_URI, channel.appLinkIntentUri); } Long rowId = existingChannelsMap.get(channel.originalNetworkId); Uri uri; |