From 1584f980175a5f6a7085da3a948b7f89adc8638b Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 23 Dec 2016 21:01:57 -0500 Subject: [PATCH 1/2] Add Exception parameter to TvPlayer --- .../com/example/android/sampletvinput/player/DemoPlayer.java | 2 +- .../google/android/media/tv/companionlibrary/AdController.java | 2 +- .../com/google/android/media/tv/companionlibrary/TvPlayer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java b/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java index 885e02dc..5099165e 100644 --- a/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java +++ b/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java @@ -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) { diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java index 0a6eec01..ff00e9e3 100644 --- a/library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java +++ b/library/src/main/java/com/google/android/media/tv/companionlibrary/AdController.java @@ -259,7 +259,7 @@ public void onCompleted() { } @Override - public void onError() { + public void onError(Exception error) { for (VideoAdPlayerCallback callback : mAdCallbacks) { callback.onError(); } diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/TvPlayer.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/TvPlayer.java index 9e6e8067..97fe2ab6 100644 --- a/library/src/main/java/com/google/android/media/tv/companionlibrary/TvPlayer.java +++ b/library/src/main/java/com/google/android/media/tv/companionlibrary/TvPlayer.java @@ -45,7 +45,7 @@ public void onCompleted() { /** * Called when an error occurs during video playback. */ - public void onError() { + public void onError(Exception error) { } From bfc01284b46acab9311227945607369aa678c7d5 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 25 Jan 2017 02:05:10 -0500 Subject: [PATCH 2/2] Removes persistent bundle booleans on API 21 --- .../media/tv/companionlibrary/EpgSyncJobService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/EpgSyncJobService.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/EpgSyncJobService.java index a05d1da3..f6a477c1 100644 --- a/library/src/main/java/com/google/android/media/tv/companionlibrary/EpgSyncJobService.java +++ b/library/src/main/java/com/google/android/media/tv/companionlibrary/EpgSyncJobService.java @@ -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; @@ -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); @@ -667,4 +672,4 @@ private void updatePrograms(Uri channelUri, List newPrograms) { } } } -} +} \ No newline at end of file