From 38fef3bf253578f518d1bc727da4afb263194398 Mon Sep 17 00:00:00 2001 From: Nick Chalko Date: Wed, 17 Jan 2018 11:15:16 -0800 Subject: Fix broken build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/com/android/tv/dvr/ui/DvrSeriesSettingsFragment.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/com/android/tv/dvr/ui/DvrSeriesSettingsFragment.java') diff --git a/src/com/android/tv/dvr/ui/DvrSeriesSettingsFragment.java b/src/com/android/tv/dvr/ui/DvrSeriesSettingsFragment.java index 9383058a..c44e44a3 100644 --- a/src/com/android/tv/dvr/ui/DvrSeriesSettingsFragment.java +++ b/src/com/android/tv/dvr/ui/DvrSeriesSettingsFragment.java @@ -16,10 +16,8 @@ package com.android.tv.dvr.ui; -import android.annotation.TargetApi; import android.app.FragmentManager; import android.content.Context; -import android.os.Build; import android.os.Bundle; import android.support.v17.leanback.app.GuidedStepFragment; import android.support.v17.leanback.widget.GuidanceStylist.Guidance; @@ -27,7 +25,7 @@ import android.support.v17.leanback.widget.GuidedAction; import android.support.v17.leanback.widget.GuidedActionsStylist; import android.util.LongSparseArray; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.data.Channel; import com.android.tv.data.ChannelDataManager; import com.android.tv.data.Program; @@ -45,8 +43,6 @@ import java.util.List; import java.util.Set; /** Fragment for DVR series recording settings. */ -@TargetApi(Build.VERSION_CODES.N) -@SuppressWarnings("AndroidApiChecker") // TODO(b/32513850) remove when error prone is updated public class DvrSeriesSettingsFragment extends GuidedStepFragment implements DvrDataManager.SeriesRecordingListener { private static final String TAG = "SeriesSettingsFragment"; @@ -85,7 +81,7 @@ public class DvrSeriesSettingsFragment extends GuidedStepFragment public void onAttach(Context context) { super.onAttach(context); mBackStackCount = getFragmentManager().getBackStackEntryCount(); - mDvrDataManager = TvSingletons.getSingletons(context).getDvrDataManager(); + mDvrDataManager = TvApplication.getSingletons(context).getDvrDataManager(); mSeriesRecordingId = getArguments().getLong(DvrSeriesSettingsActivity.SERIES_RECORDING_ID); mSeriesRecording = mDvrDataManager.getSeriesRecording(mSeriesRecordingId); if (mSeriesRecording == null) { @@ -106,7 +102,7 @@ public class DvrSeriesSettingsFragment extends GuidedStepFragment } Set channelIds = new HashSet<>(); ChannelDataManager channelDataManager = - TvSingletons.getSingletons(context).getChannelDataManager(); + TvApplication.getSingletons(context).getChannelDataManager(); for (Program program : mPrograms) { long channelId = program.getChannelId(); if (channelIds.add(channelId)) { @@ -212,7 +208,7 @@ public class DvrSeriesSettingsFragment extends GuidedStepFragment if (mSelectedChannelId != Channel.INVALID_ID) { builder.setChannelId(mSelectedChannelId); } - DvrManager dvrManager = TvSingletons.getSingletons(getContext()).getDvrManager(); + DvrManager dvrManager = TvApplication.getSingletons(getContext()).getDvrManager(); dvrManager.updateSeriesRecording(builder.build()); if (mCurrentProgram != null && (mChannelOption == SeriesRecording.OPTION_CHANNEL_ALL @@ -332,7 +328,7 @@ public class DvrSeriesSettingsFragment extends GuidedStepFragment recordingCandidates) .get(mSeriesRecordingId); if (!programsToSchedule.isEmpty()) { - TvSingletons.getSingletons(getContext()) + TvApplication.getSingletons(getContext()) .getDvrManager() .addScheduleToSeriesRecording(mSeriesRecording, programsToSchedule); } -- cgit v1.2.3