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

Merge "AtscTvInput: Use the new android.media.tv.* classes" into lmp-preview-dev

Browse Source
This commit is contained in:
Jae Seo
2014-06-02 21:04:07 +00:00
committed by Android (Google) Code Review
parent c06fc0073e d0fadf8726
commit f32b19ee31
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/AtscTvInput/AndroidManifest.xml
View File

@@ -26,14 +26,14 @@
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.tv.SetupActivity" /> <action android:name="android.media.tv.SetupActivity" />
</intent-filter> </intent-filter>
</activity> </activity>
<service android:name="com.example.android.atsctvinput.AtscTvInputService" <service android:name="com.example.android.atsctvinput.AtscTvInputService"
android:permission="android.permission.BIND_TV_INPUT" android:permission="android.permission.BIND_TV_INPUT"
android:process=":remoteAtscTvInput"> android:process=":remoteAtscTvInput">
<intent-filter> <intent-filter>
<action android:name="android.tv.TvInputService" /> <action android:name="android.media.tv.TvInputService" />
</intent-filter> </intent-filter>
</service> </service>
</application> </application>

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

@@ -18,10 +18,12 @@ package com.example.android.atsctvinput;
import android.app.Activity; import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.ComponentName;
import android.content.ContentValues; import android.content.ContentValues;
import android.media.tv.TvContract;
import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.provider.TvContract;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -67,11 +69,9 @@ public class AtscTvInputScanActivity extends Activity {
} }
private void clearChannels() { private void clearChannels() {
String selection = TvContract.Channels.COLUMN_SERVICE_NAME + " = ?"; Uri uri = TvContract.buildChannelsUriForInput(
String[] selectionArgs = new String[] { new ComponentName(this, AtscTvInputService.class));
AtscTvInputService.class.getName() getContentResolver().delete(uri, null, null);
};
getContentResolver().delete(TvContract.Channels.CONTENT_URI, selection, selectionArgs);
} }
private void doAutoScan() { private void doAutoScan() {

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

@@ -21,10 +21,10 @@ import android.content.ContentValues;
import android.content.res.AssetFileDescriptor; import android.content.res.AssetFileDescriptor;
import android.database.Cursor; import android.database.Cursor;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.media.tv.TvContract;
import android.media.tv.TvInputService;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.provider.TvContract;
import android.tv.TvInputService;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.view.Surface; import android.view.Surface;
@@ -159,10 +159,8 @@ public class AtscTvInputService extends TvInputService {
} }
private void clearPrograms(Uri channelUri) { private void clearPrograms(Uri channelUri) {
String selection = TvContract.Programs.COLUMN_CHANNEL_ID + " = ?"; Uri uri = TvContract.buildProgramsUriForChannel(channelUri);
String[] selectionArgs = getContentResolver().delete(uri, null, null);
new String[] { Long.toString(ContentUris.parseId(channelUri)) };
getContentResolver().delete(TvContract.Programs.CONTENT_URI, selection, selectionArgs);
} }
private Uri insertProgram(Uri channelUri, EITItem event, long timeOffsetMs) { private Uri insertProgram(Uri channelUri, EITItem event, long timeOffsetMs) {