Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

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;