diff options
| author | Dongwon Kang <dwkang@google.com> | 2014-10-15 17:01:48 +0900 |
|---|---|---|
| committer | Dongwon Kang <dwkang@google.com> | 2014-10-15 17:13:30 +0900 |
| commit | 5462b213ed14735289692cf525a46aa27fc3ba26 (patch) | |
| tree | 8e1762fc49fb51949c3ae7778e308aa2d85c5422 | |
| parent | 4cf2b25671ca94b824cc80b540075fb34afeae1c (diff) | |
| download | TvProvider-5462b213ed14735289692cf525a46aa27fc3ba26.tar.gz | |
Fix the type of COLUMN_TYPE and COLUMN_SERVICE_TYPE.android-wear-5.0.0_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-release
They should be texts per the definition in TvContract.Channels.
Bug: 17993656
Change-Id: I6ed6267726154a41cd0ee25145a56ac850f6a633
| -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 4ce8929..f1ffa6c 100644 --- a/src/com/android/providers/tv/TvProvider.java +++ b/src/com/android/providers/tv/TvProvider.java @@ -82,7 +82,7 @@ public class TvProvider extends ContentProvider { private static final String OP_UPDATE = "update"; private static final String OP_DELETE = "delete"; - private static final int DATABASE_VERSION = 20; + private static final int DATABASE_VERSION = 21; private static final String DATABASE_NAME = "tv.db"; private static final String CHANNELS_TABLE = "channels"; private static final String PROGRAMS_TABLE = "programs"; @@ -256,8 +256,9 @@ public class TvProvider extends ContentProvider { + Channels._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + Channels.COLUMN_PACKAGE_NAME + " TEXT NOT NULL," + Channels.COLUMN_INPUT_ID + " TEXT NOT NULL," - + Channels.COLUMN_TYPE + " INTEGER NOT NULL DEFAULT 0," - + Channels.COLUMN_SERVICE_TYPE + " INTEGER NOT NULL DEFAULT 1," + + Channels.COLUMN_TYPE + " TEXT NOT NULL DEFAULT '" + Channels.TYPE_OTHER + "'," + + Channels.COLUMN_SERVICE_TYPE + " TEXT NOT NULL DEFAULT '" + + Channels.SERVICE_TYPE_AUDIO_VIDEO + "'," + Channels.COLUMN_ORIGINAL_NETWORK_ID + " INTEGER NOT NULL DEFAULT 0," + Channels.COLUMN_TRANSPORT_STREAM_ID + " INTEGER NOT NULL DEFAULT 0," + Channels.COLUMN_SERVICE_ID + " INTEGER NOT NULL DEFAULT 0," |