commit eae43ee24e17d07485519920126b723188f32e5b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:31:24 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:31:24 2023 +0000
tree cfef64d8548cb2b1ec742800d86615ee3f29e9f1
parent 5bf95529f5c5d5e12e0ad2e18ad81ad8e0c6b858
parent 3a19a426ba445558160a1eac1d40e745e4972345

Snap for 10103804 from 3a19a426ba445558160a1eac1d40e745e4972345 to mainline-tzdata5-release

Change-Id: Iadee079533b084ae1922263fe0123a317a20d0ff

src/com/android/providers/tv/TvProvider.java

diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java
index ea9b859..e1d6c88 100644
--- a/src/com/android/providers/tv/TvProvider.java
+++ b/src/com/android/providers/tv/TvProvider.java
@@ -146,7 +146,8 @@
 
     private static final String EMPTY_STRING = "";
 
-    private static final long MAX_PROGRAM_DATA_DELAY_IN_MILLIS = 10 * 1000; // 10 seconds
+    private static final long PROGRAM_DATA_START_WATCH_DELAY_IN_MILLIS = 10 * 1000; // 10 seconds
+    private static final long PROGRAM_DATA_END_WATCH_DELAY_IN_MILLIS = 1 * 1000; // 1 second
 
     private static final Map<String, String> sChannelProjectionMap = new HashMap<>();
     private static final Map<String, String> sProgramProjectionMap = new HashMap<>();
@@ -1603,7 +1604,7 @@
             if (rowId > 0) {
                 mLogHandler.removeMessages(WatchLogHandler.MSG_TRY_CONSOLIDATE_ALL);
                 mLogHandler.sendEmptyMessageDelayed(WatchLogHandler.MSG_TRY_CONSOLIDATE_ALL,
-                        MAX_PROGRAM_DATA_DELAY_IN_MILLIS);
+                        PROGRAM_DATA_START_WATCH_DELAY_IN_MILLIS);
                 return TvContract.buildWatchedProgramUri(rowId);
             }
             Log.w(TAG, "Failed to insert row for " + values + ". Channel does not exist.");
@@ -1613,7 +1614,7 @@
             args.arg1 = values.getAsString(WatchedPrograms.COLUMN_INTERNAL_SESSION_TOKEN);
             args.arg2 = watchEndTime;
             Message msg = mLogHandler.obtainMessage(WatchLogHandler.MSG_CONSOLIDATE, args);
-            mLogHandler.sendMessageDelayed(msg, MAX_PROGRAM_DATA_DELAY_IN_MILLIS);
+            mLogHandler.sendMessageDelayed(msg, PROGRAM_DATA_END_WATCH_DELAY_IN_MILLIS);
             return null;
         }
         // All the other cases are invalid.