diff options
author | Nick Chalko <nchalko@google.com> | 2018-01-17 11:15:16 -0800 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2018-01-17 11:20:37 -0800 |
commit | 38fef3bf253578f518d1bc727da4afb263194398 (patch) | |
tree | 09a06234eda7c54216bca773b6d8407eafe0722d /src/com/android/tv/dvr/ui/DvrScheduleFragment.java | |
parent | c9889d13513e26649a7708cf2d0562cb592d441a (diff) | |
download | TV-38fef3bf253578f518d1bc727da4afb263194398.tar.gz |
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
Diffstat (limited to 'src/com/android/tv/dvr/ui/DvrScheduleFragment.java')
-rw-r--r-- | src/com/android/tv/dvr/ui/DvrScheduleFragment.java | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/com/android/tv/dvr/ui/DvrScheduleFragment.java b/src/com/android/tv/dvr/ui/DvrScheduleFragment.java index 5251e140..854fea56 100644 --- a/src/com/android/tv/dvr/ui/DvrScheduleFragment.java +++ b/src/com/android/tv/dvr/ui/DvrScheduleFragment.java @@ -27,7 +27,7 @@ import android.support.v17.leanback.widget.GuidanceStylist.Guidance; import android.support.v17.leanback.widget.GuidedAction; import android.text.format.DateUtils; import com.android.tv.R; -import com.android.tv.TvSingletons; +import com.android.tv.TvApplication; import com.android.tv.common.SoftPreconditions; import com.android.tv.data.Program; import com.android.tv.dvr.DvrManager; @@ -63,18 +63,16 @@ public class DvrScheduleFragment extends DvrGuidedStepFragment { mProgram = args.getParcelable(DvrHalfSizedDialogFragment.KEY_PROGRAM); mAddCurrentProgramToSeries = args.getBoolean(KEY_ADD_CURRENT_PROGRAM_TO_SERIES, false); } - DvrManager dvrManager = TvSingletons.getSingletons(getContext()).getDvrManager(); + DvrManager dvrManager = TvApplication.getSingletons(getContext()).getDvrManager(); SoftPreconditions.checkArgument( mProgram != null && mProgram.isEpisodic(), TAG, - "The program should be episodic: %s ", - mProgram); + "The program should be episodic: " + mProgram); SeriesRecording seriesRecording = dvrManager.getSeriesRecording(mProgram); SoftPreconditions.checkArgument( seriesRecording == null || seriesRecording.isStopped(), TAG, - "The series recording should be stopped or null: %s", - seriesRecording); + "The series recording should be stopped or null: " + seriesRecording); super.onCreate(savedInstanceState); } @@ -146,7 +144,7 @@ public class DvrScheduleFragment extends DvrGuidedStepFragment { } } else if (action.getId() == ACTION_RECORD_SERIES) { SeriesRecording seriesRecording = - TvSingletons.getSingletons(getContext()) + TvApplication.getSingletons(getContext()) .getDvrDataManager() .getSeriesRecording(mProgram.getSeriesId()); if (seriesRecording == null) { @@ -161,7 +159,7 @@ public class DvrScheduleFragment extends DvrGuidedStepFragment { seriesRecording = SeriesRecording.buildFrom(seriesRecording) .setPriority( - TvSingletons.getSingletons(getContext()) + TvApplication.getSingletons(getContext()) .getDvrScheduleManager() .suggestNewSeriesPriority()) .build(); |