From dd8a25c2d40bc6c5ffae4ebcf750689f6603bf68 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Mon, 10 Apr 2023 22:32:40 -0700
Subject: Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I15bda8e6ba734b189c1a04f21cbb47e1d3e03ef8
---
 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


From 9ed33441d88208707cf85cc5cf1bb114569a2dba Mon Sep 17 00:00:00 2001
From: Junichiro <Junichiro.Homma@sony.com>
Date: Wed, 4 Oct 2023 22:32:35 +0000
Subject: TvProvider API standardization for DVB TvProvider

Add columns to db tables for DVB.

Bug: 222402395
Test: CTS
(cherry picked from https://android-review.googlesource.com/q/commit:e1f20a750154b6b77b1e9e5bec722d282729ce5d)
Merged-In: I45b6e73d80dff6ecb38f31d488b80c36fb83db53
Change-Id: I45b6e73d80dff6ecb38f31d488b80c36fb83db53
---
 src/com/android/providers/tv/TvProvider.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/com/android/providers/tv/TvProvider.java b/src/com/android/providers/tv/TvProvider.java
index ea7bc18..99b19c5 100644
--- a/src/com/android/providers/tv/TvProvider.java
+++ b/src/com/android/providers/tv/TvProvider.java
@@ -89,7 +89,7 @@ public class TvProvider extends ContentProvider {
     private static final boolean DEBUG = false;
     private static final String TAG = "TvProvider";
 
-    static final int DATABASE_VERSION = 39;
+    static final int DATABASE_VERSION = 40;
     static final String SHARED_PREF_BLOCKED_PACKAGES_KEY = "blocked_packages";
     static final String CHANNELS_TABLE = "channels";
     static final String PROGRAMS_TABLE = "programs";
@@ -248,6 +248,8 @@ public class TvProvider extends ContentProvider {
                 CHANNELS_TABLE + "." + Channels.COLUMN_CHANNEL_LIST_ID);
         sChannelProjectionMap.put(Channels.COLUMN_BROADCAST_GENRE,
                 CHANNELS_TABLE + "." + Channels.COLUMN_BROADCAST_GENRE);
+        sChannelProjectionMap.put(Channels.COLUMN_BROADCAST_VISIBILITY_TYPE,
+                CHANNELS_TABLE + "." + Channels.COLUMN_BROADCAST_VISIBILITY_TYPE);
 
         sProgramProjectionMap.clear();
         sProgramProjectionMap.put(Programs._ID, Programs._ID);
@@ -873,6 +875,10 @@ public class TvProvider extends ContentProvider {
                     + Channels.COLUMN_VIDEO_RESOLUTION + " TEXT,"
                     + Channels.COLUMN_CHANNEL_LIST_ID + " TEXT,"
                     + Channels.COLUMN_BROADCAST_GENRE + " TEXT,"
+                    + Channels.COLUMN_BROADCAST_VISIBILITY_TYPE
+                            + " INTEGER NOT NULL DEFAULT "
+                            + Channels.BROADCAST_VISIBILITY_TYPE_VISIBLE
+                            + ","
                     // Needed for foreign keys in other tables.
                     + "UNIQUE(" + Channels._ID + "," + Channels.COLUMN_PACKAGE_NAME + ")"
                     + ");");
@@ -1159,6 +1165,16 @@ public class TvProvider extends ContentProvider {
                             + RecordedPrograms.COLUMN_INTERNAL_PROVIDER_ID + " TEXT;");
                 }
             }
+            if (oldVersion <= 39) {
+                if (!getColumnNames(db, CHANNELS_TABLE)
+                        .contains(Channels.COLUMN_BROADCAST_VISIBILITY_TYPE)) {
+                    db.execSQL("ALTER TABLE " + CHANNELS_TABLE + " ADD "
+                            + Channels.COLUMN_BROADCAST_VISIBILITY_TYPE
+                            + " INTEGER NOT NULL DEFAULT "
+                            + Channels.BROADCAST_VISIBILITY_TYPE_VISIBLE
+                            + ";");
+                }
+            }
             Log.i(TAG, "Upgrading from version " + oldVersion + " to " + newVersion + " is done.");
         }
 
-- 
cgit v1.2.3