LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change the column names of the TvContract tables

Browse Source 
Change-Id: Icd5a1fd8418e49a506e2a8dbffa1d96d5a62ed57
This commit is contained in:
Jae Seo
2014-05-14 11:50:37 -07:00
parent b24ff8773d
commit f8e9306c20
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputScanActivity.java
View File

@@ -67,7 +67,7 @@ public class AtscTvInputScanActivity extends Activity {
} }
private void clearChannels() { private void clearChannels() {
String selection = TvContract.Channels.SERVICE_NAME + " = ?"; String selection = TvContract.Channels.COLUMN_SERVICE_NAME + " = ?";
String[] selectionArgs = new String[] { String[] selectionArgs = new String[] {
AtscTvInputService.class.getName() AtscTvInputService.class.getName()
}; };
@@ -92,11 +92,11 @@ public class AtscTvInputScanActivity extends Activity {
Log.d(TAG, "Channel " + channel.getShortName() + " " + channel.getMajorChannelNumber() Log.d(TAG, "Channel " + channel.getShortName() + " " + channel.getMajorChannelNumber()
+ "-" + channel.getMinorChannelNumber() + " is detected."); + "-" + channel.getMinorChannelNumber() + " is detected.");
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(TvContract.Channels.SERVICE_NAME, AtscTvInputService.class.getName()); values.put(TvContract.Channels.COLUMN_SERVICE_NAME, AtscTvInputService.class.getName());
values.put(TvContract.Channels.DISPLAY_NUMBER, values.put(TvContract.Channels.COLUMN_DISPLAY_NUMBER,
channel.getMajorChannelNumber() + "-" + channel.getMinorChannelNumber()); channel.getMajorChannelNumber() + "-" + channel.getMinorChannelNumber());
values.put(TvContract.Channels.DISPLAY_NAME, channel.getShortName()); values.put(TvContract.Channels.COLUMN_DISPLAY_NAME, channel.getShortName());
values.put(TvContract.Channels.DATA, SampleTsStream.getTuneInfo(stream)); values.put(TvContract.Channels.COLUMN_DATA, SampleTsStream.getTuneInfo(stream));
getContentResolver().insert(TvContract.Channels.CONTENT_URI, values); getContentResolver().insert(TvContract.Channels.CONTENT_URI, values);
} }
} }

12
samples/AtscTvInput/src/com/example/android/atsctvinput/AtscTvInputService.java
View File

@@ -62,7 +62,7 @@ public class AtscTvInputService extends TvInputService {
public TsStream getTsStreamForChannel(Uri channelUri) { public TsStream getTsStreamForChannel(Uri channelUri) {
String[] projection = { TvContract.Channels.DATA }; String[] projection = { TvContract.Channels.COLUMN_DATA };
if (channelUri == null) { if (channelUri == null) {
return null; return null;
} }
@@ -159,7 +159,7 @@ public class AtscTvInputService extends TvInputService {
} }
private void clearPrograms(Uri channelUri) { private void clearPrograms(Uri channelUri) {
String selection = TvContract.Programs.CHANNEL_ID + " = ?"; String selection = TvContract.Programs.COLUMN_CHANNEL_ID + " = ?";
String[] selectionArgs = String[] selectionArgs =
new String[] { Long.toString(ContentUris.parseId(channelUri)) }; new String[] { Long.toString(ContentUris.parseId(channelUri)) };
getContentResolver().delete(TvContract.Programs.CONTENT_URI, selection, selectionArgs); getContentResolver().delete(TvContract.Programs.CONTENT_URI, selection, selectionArgs);
@@ -168,11 +168,11 @@ public class AtscTvInputService extends TvInputService {
private Uri insertProgram(Uri channelUri, EITItem event, long timeOffsetMs) { private Uri insertProgram(Uri channelUri, EITItem event, long timeOffsetMs) {
Log.d(TAG, "insertProgram " + event.getTitleText()); Log.d(TAG, "insertProgram " + event.getTitleText());
ContentValues values = new ContentValues(); ContentValues values = new ContentValues();
values.put(TvContract.Programs.CHANNEL_ID, ContentUris.parseId(channelUri)); values.put(TvContract.Programs.COLUMN_CHANNEL_ID, ContentUris.parseId(channelUri));
values.put(TvContract.Programs.TITLE, event.getTitleText()); values.put(TvContract.Programs.COLUMN_TITLE, event.getTitleText());
values.put(TvContract.Programs.START_TIME_UTC_MILLIS, timeOffsetMs values.put(TvContract.Programs.COLUMN_START_TIME_UTC_MILLIS, timeOffsetMs
+ event.getStartTime() * SEC_IN_MS); + event.getStartTime() * SEC_IN_MS);
values.put(TvContract.Programs.END_TIME_UTC_MILLIS, timeOffsetMs values.put(TvContract.Programs.COLUMN_END_TIME_UTC_MILLIS, timeOffsetMs
+ (event.getStartTime() + event.getLengthInSecond()) * SEC_IN_MS); + (event.getStartTime() + event.getLengthInSecond()) * SEC_IN_MS);
return getContentResolver().insert( return getContentResolver().insert(
TvContract.Programs.CONTENT_URI, values); TvContract.Programs.CONTENT_URI, values);