diff options
| author | Xin Li <delphij@google.com> | 2023-10-05 15:42:57 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-10-05 15:42:57 -0700 |
| commit | 5dc2b7a4d5951aa2b2bd893c847fae45b6560782 (patch) | |
| tree | e8e684930eec2459ee13c27d0ca2a0cdbefcd577 | |
| parent | 6b0378d616c2c4d55169523e330d66d726274666 (diff) | |
| parent | db616a661a0a5f0a89823de94311820149568f34 (diff) | |
| download | TvProvider-5dc2b7a4d5951aa2b2bd893c847fae45b6560782.tar.gz | |
Merge Android 14
Bug: 298295554
Merged-In: Icd5029efa04e1239704cc2a81c43a1485f256f04
Change-Id: I60d9e7966b876ea2fd62388ca241814264fd238f
| -rw-r--r-- | src/com/android/providers/tv/TvProvider.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java index 7ba1e29..ea7bc18 100644 --- a/src/com/android/providers/tv/TvProvider.java +++ b/src/com/android/providers/tv/TvProvider.java @@ -146,7 +146,8 @@ public class TvProvider extends ContentProvider { 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<>(); @@ -1604,7 +1605,7 @@ public class TvProvider extends ContentProvider { 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."); @@ -1614,7 +1615,7 @@ public class TvProvider extends ContentProvider { 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. |