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/TimeShiftManager.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/TimeShiftManager.java')
-rw-r--r-- | src/com/android/tv/TimeShiftManager.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/tv/TimeShiftManager.java b/src/com/android/tv/TimeShiftManager.java index e37f190c..513fe3cd 100644 --- a/src/com/android/tv/TimeShiftManager.java +++ b/src/com/android/tv/TimeShiftManager.java @@ -146,8 +146,8 @@ public class TimeShiftManager { DISABLE_ACTION_THRESHOLD + 3 * REQUEST_CURRENT_POSITION_INTERVAL; /** * The current position sent from TIS can not be exactly the same as the current system time due - * to the elapsed time to pass the message from TIS to Live TV. So the boundary threshold - * is necessary. The same goes for the recording start time. It's the same {@link + * to the elapsed time to pass the message from TIS to Live TV. So the boundary threshold is + * necessary. The same goes for the recording start time. It's the same {@link * #REQUEST_CURRENT_POSITION_INTERVAL}. */ private static final long RECORDING_BOUNDARY_THRESHOLD = REQUEST_CURRENT_POSITION_INTERVAL; @@ -1095,9 +1095,10 @@ public class TimeShiftManager { SoftPreconditions.checkArgument( endTimeMs - startTimeMs <= TWO_WEEKS_MS, TAG, - "createDummyProgram: long duration of dummy programs are requested ( %s , %s)", - Utils.toTimeString(startTimeMs), - Utils.toTimeString(endTimeMs)); + "createDummyProgram: long duration of dummy programs are requested (" + + Utils.toTimeString(startTimeMs) + + ", " + + Utils.toTimeString(endTimeMs)); if (startTimeMs >= endTimeMs) { return Collections.emptyList(); } |