From 0468a0d91e8ac142a74f15c2c2e6ec098a40946a Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sat, 3 Sep 2022 13:41:57 -0700
Subject: Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Ieab4e0d79549fdd6e322303478423e43685df0d8
---
 res/values-ro/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index c2c7d0e..e6a3ddb 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,5 +18,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7454398782183407432">"TV Storage"</string>
     <string name="permlab_readTvListings" msgid="5272001606068276291">"citire toate listele de programe TV"</string>
-    <string name="permdesc_readTvListings" msgid="1165157606059567535">"citesc toate listele de programe TV disponibile pe dispozitivul dvs."</string>
+    <string name="permdesc_readTvListings" msgid="1165157606059567535">"citesc toate listele de programe TV disponibile pe dispozitivul tău"</string>
 </resources>
-- 
cgit v1.2.3


From 42b4ecaf492d01cdf10f6a56a0695e90ede13328 Mon Sep 17 00:00:00 2001
From: Yixiao Luo <yixiaoluo@google.com>
Date: Tue, 14 Mar 2023 18:04:26 -0700
Subject: Reduce the delay for logging watched programs

Bug: 269526020
Test: m
Change-Id: I1177fe0f45027bf71acfba7ed98d441d06f5d382
---
 src/com/android/providers/tv/TvProvider.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 @@ 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<>();
@@ -1603,7 +1604,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.");
@@ -1613,7 +1614,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.
-- 
cgit v1.2.3


From a92fd400301d4aaa0f02754085b1fab8b9095fcc Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Sun, 2 Apr 2023 16:57:52 -0700
Subject: Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: Idc9404882656bb9168e58c34ad823b9fe35853df
---
 res/values-te/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index e9c0dbf..330e2da 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="7454398782183407432">"టీవీ నిల్వ"</string>
+    <string name="app_label" msgid="7454398782183407432">"టీవీ స్టోరేజ్‌"</string>
     <string name="permlab_readTvListings" msgid="5272001606068276291">"అన్ని టీవీ లిస్ట్‌లను చదవడం"</string>
     <string name="permdesc_readTvListings" msgid="1165157606059567535">"మీ పరికరంలో అందుబాటులో ఉండే అన్ని టీవీ లిస్ట్‌లను చదువుతుంది"</string>
 </resources>
-- 
cgit v1.2.3