Skip to content

Add Exception parameter to TvPlayer #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Exception parameter to TvPlayer #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1584f98
Add Exception parameter to TvPlayer
Fleker Dec 24, 2016
bfc0128
Removes persistent bundle booleans on API 21
Fleker Jan 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ public void onPlayerStateChanged(boolean playWhenReady, int state) {
@Override
public void onPlayerError(ExoPlaybackException exception) {
for (Callback tvCallback : mTvPlayerCallbacks) {
tvCallback.onError();
tvCallback.onError(exception);
}
rendererBuildingState = RENDERER_BUILDING_STATE_IDLE;
for (Listener listener : listeners) {
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public void onCompleted() {
}

@Override
public void onError() {
public void onError(Exception error) {
for (VideoAdPlayerCallback callback : mAdCallbacks) {
callback.onError();
}
Expand Down
7 changes: 6 additions & 1 deletion library/src/main/java/com/google/android/media/tv/companionlibrary/EpgSyncJobService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import android.media.tv.TvInputInfo;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
import android.os.PersistableBundle;
import android.os.RemoteException;
import android.support.annotation.VisibleForTesting;
Expand Down Expand Up @@ -327,6 +328,10 @@ public static void requestImmediateSync(Context context, String inputId, long sy
throw new IllegalArgumentException("This class does not extend EpgSyncJobService");
}
PersistableBundle persistableBundle = new PersistableBundle();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
persistableBundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
persistableBundle.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
}
persistableBundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
persistableBundle.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
persistableBundle.putString(EpgSyncJobService.BUNDLE_KEY_INPUT_ID, inputId);
Expand Down Expand Up @@ -667,4 +672,4 @@ private void updatePrograms(Uri channelUri, List<Program> newPrograms) {
}
}
}
}
}
2 changes: 1 addition & 1 deletion library/src/main/java/com/google/android/media/tv/companionlibrary/TvPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void onCompleted() {
/**
* Called when an error occurs during video playback.
*/
public void onError() {
public void onError(Exception error) {

}

Expand Down