diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-29 00:20:48 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-11-29 00:20:48 +0000 |
commit | 7b32e8a67561a7989dbfc0f1d3480dca162c6769 (patch) | |
tree | d31e2adc1f9cce4f27ca07d30bee921032e33a3c /src/com/android/tv/TimeShiftManager.java | |
parent | bc7f430decab0bc34a533811efe457d4615f28aa (diff) | |
parent | bb2e798ef4d546dd54cd9e95796403062b860c15 (diff) | |
download | TV-7b32e8a67561a7989dbfc0f1d3480dca162c6769.tar.gz |
Snap for 4448085 from bb2e798ef4d546dd54cd9e95796403062b860c15 to oc-m3-releaseandroid-8.1.0_r9android-8.1.0_r7android-8.1.0_r22android-8.1.0_r21android-8.1.0_r18android-8.1.0_r17android-8.1.0_r14android-8.1.0_r13oreo-m5-releaseoreo-m3-release
Change-Id: I0aff16fbf430ba5e4dbba83b8e06e4a23b38060a
Diffstat (limited to 'src/com/android/tv/TimeShiftManager.java')
-rw-r--r-- | src/com/android/tv/TimeShiftManager.java | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/com/android/tv/TimeShiftManager.java b/src/com/android/tv/TimeShiftManager.java index 2d6d45c4..70885936 100644 --- a/src/com/android/tv/TimeShiftManager.java +++ b/src/com/android/tv/TimeShiftManager.java @@ -161,7 +161,6 @@ public class TimeShiftManager { @TimeShiftActionId private int mLastActionId = 0; - // TODO: Remove these variables once API level 23 is available. private final Context mContext; private Program mCurrentProgram; @@ -618,6 +617,15 @@ public class TimeShiftManager { + mAvailablityChangedTimeMs); return; } + if (recordStartTimeMs > System.currentTimeMillis()) { + // The time reported by TvInputService might not consistent with system + // clock,, use system's current time instead. + Log.e(TAG, "The start time should not be earlier than the current time, " + + "reset the start time to the system's current time: {" + + "startTime: " + recordStartTimeMs + ", current time: " + + System.currentTimeMillis()); + recordStartTimeMs = System.currentTimeMillis(); + } if (mRecordStartTimeMs == recordStartTimeMs) { return; } @@ -887,10 +895,12 @@ public class TimeShiftManager { } long fetchStartTimeMs = Utils.floorTime(startTimeMs, MAX_DUMMY_PROGRAM_DURATION); - boolean needToLoad = addDummyPrograms(fetchStartTimeMs, - endTimeMs + PREFETCH_DURATION_FOR_NEXT); + long fetchEndTimeMs = Utils.ceilTime(endTimeMs + PREFETCH_DURATION_FOR_NEXT, + MAX_DUMMY_PROGRAM_DURATION); + removeOutdatedPrograms(fetchStartTimeMs); + boolean needToLoad = addDummyPrograms(fetchStartTimeMs, fetchEndTimeMs); if (needToLoad) { - Range<Long> period = Range.create(fetchStartTimeMs, endTimeMs); + Range<Long> period = Range.create(fetchStartTimeMs, fetchEndTimeMs); mProgramLoadQueue.add(period); startTaskIfNeeded(); } @@ -996,6 +1006,12 @@ public class TimeShiftManager { return added; } + private void removeOutdatedPrograms(long startTimeMs) { + while (mPrograms.size() > 0 && mPrograms.get(0).getEndTimeUtcMillis() <= startTimeMs) { + mPrograms.remove(0); + } + } + private void removeDummyPrograms() { for (Iterator<Program> it = mPrograms.listIterator(); it.hasNext(); ) { if (!it.next().isValid()) { @@ -1012,7 +1028,7 @@ public class TimeShiftManager { for (int i = 0, j = 0; i < mPrograms.size() && j < loadedPrograms.size(); ++j) { Program loadedProgram = loadedPrograms.get(j); // Skip previous programs. - while (program.getEndTimeUtcMillis() < loadedProgram.getStartTimeUtcMillis()) { + while (program.getEndTimeUtcMillis() <= loadedProgram.getStartTimeUtcMillis()) { // Reached end of mPrograms. if (++i == mPrograms.size()) { return; |