diff options
| author | Xin Li <delphij@google.com> | 2024-01-17 22:14:35 -0800 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2024-01-17 22:14:35 -0800 |
| commit | 1481de69cd6ebe740a5ae332a17eaf904d13847e (patch) | |
| tree | 7151b377a22459c7410c6bd78a9ad6f21226b4b2 | |
| parent | af3bd06db93df39ea45e2c675fe5700ebfa7b534 (diff) | |
| parent | 469cbcbc476236a50be8d7e57f8093dc10439344 (diff) | |
| download | TvProvider-1481de69cd6ebe740a5ae332a17eaf904d13847e.tar.gz | |
Merge Android 24Q1 Release (ab/11220357)
Bug: 319669529
Merged-In: I45b6e73d80dff6ecb38f31d488b80c36fb83db53
Change-Id: I38741006c5cc25e8b9633c1d2545219cb891e9c6
| -rw-r--r-- | src/com/android/providers/tv/TvProvider.java | 18 |
1 files changed, 17 insertions, 1 deletions
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."); } |