diff options
| author | nchalko <nchalko@google.com> | 2019-06-17 17:41:59 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2019-06-19 16:34:35 -0700 |
| commit | e71ffbff6b5af9c9d52ef8f4cea5f8841102f44a (patch) | |
| tree | 3e706705bd99e9629257170f312247836d7c6148 /src | |
| parent | 42bb98a3bcf9336f2ca6c5949fb31c597e3516ed (diff) | |
| download | TV-e71ffbff6b5af9c9d52ef8f4cea5f8841102f44a.tar.gz | |
PUBLIC: Use Pair.create instead of new
PiperOrigin-RevId: 253696888
Change-Id: I7d54ca4bd78c6f821ff41c8eae3c7da8bb023932
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/tv/data/PreviewDataManager.java | 7 | ||||
| -rw-r--r-- | src/com/android/tv/data/PreviewProgramContent.java | 4 | ||||
| -rw-r--r-- | src/com/android/tv/recommendation/Recommender.java | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/tv/data/PreviewDataManager.java b/src/com/android/tv/data/PreviewDataManager.java index 91aca09a..dbe6028c 100644 --- a/src/com/android/tv/data/PreviewDataManager.java +++ b/src/com/android/tv/data/PreviewDataManager.java @@ -32,11 +32,14 @@ import android.support.annotation.IntDef; import android.support.annotation.MainThread; import android.util.Log; import android.util.Pair; + import androidx.tvprovider.media.tv.ChannelLogoUtils; import androidx.tvprovider.media.tv.PreviewProgram; + import com.android.tv.R; import com.android.tv.common.util.PermissionUtils; import com.android.tv.util.images.ImageLoader; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.HashMap; @@ -219,7 +222,7 @@ public class PreviewDataManager { Uri previewChannelsUri = PreviewDataUtils.addQueryParamToUri( TvContract.Channels.CONTENT_URI, - new Pair<>(PARAM_PREVIEW, String.valueOf(true))); + Pair.create(PARAM_PREVIEW, String.valueOf(true))); String packageName = mContext.getPackageName(); if (PermissionUtils.hasAccessAllEpg(mContext)) { try (Cursor cursor = @@ -436,7 +439,7 @@ public class PreviewDataManager { mContentResolver.insert( TvContract.PreviewPrograms.CONTENT_URI, PreviewDataUtils.createPreviewProgramFromContent( - program, aspectRatio) + program, aspectRatio) .toContentValues()); if (programUri != null) { long previewProgramId = ContentUris.parseId(programUri); diff --git a/src/com/android/tv/data/PreviewProgramContent.java b/src/com/android/tv/data/PreviewProgramContent.java index c07537da..4ee57104 100644 --- a/src/com/android/tv/data/PreviewProgramContent.java +++ b/src/com/android/tv/data/PreviewProgramContent.java @@ -83,7 +83,7 @@ public class PreviewProgramContent { .setIntentUri(channel.getUri()) .setPreviewVideoUri( PreviewDataManager.PreviewDataUtils.addQueryParamToUri( - channel.getUri(), new Pair<>(PARAM_INPUT, channel.getInputId()))) + channel.getUri(), Pair.create(PARAM_INPUT, channel.getInputId()))) .build(); } @@ -103,7 +103,7 @@ public class PreviewProgramContent { .setPreviewVideoUri( PreviewDataManager.PreviewDataUtils.addQueryParamToUri( recordedProgramUri, - new Pair<>(PARAM_INPUT, recordedProgram.getInputId()))) + Pair.create(PARAM_INPUT, recordedProgram.getInputId()))) .build(); } diff --git a/src/com/android/tv/recommendation/Recommender.java b/src/com/android/tv/recommendation/Recommender.java index f350799f..a8535a49 100644 --- a/src/com/android/tv/recommendation/Recommender.java +++ b/src/com/android/tv/recommendation/Recommender.java @@ -20,7 +20,9 @@ import android.content.Context; import android.support.annotation.VisibleForTesting; import android.util.Log; import android.util.Pair; + import com.android.tv.data.api.Channel; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -127,7 +129,7 @@ public class Recommender implements RecommendationDataManager.Listener { } } if (!mIncludeRecommendedOnly || maxScore != Evaluator.NOT_RECOMMENDED) { - records.add(new Pair<>(cr.getChannel(), maxScore)); + records.add(Pair.create(cr.getChannel(), maxScore)); } } if (size > records.size()) { |