Skip to content
This repository has been archived by the owner on Jun 5, 2021. It is now read-only.

Commit

Permalink
2810 Release - Crash fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom Schultz committed Jun 29, 2018
1 parent fccc448 commit 064ea78
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 41 deletions.
6 changes: 3 additions & 3 deletions constants.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
// limitations under the License.
project.ext {
// ExoPlayer version and version code.
releaseVersion = '2.8.8'
releaseVersionCode = 2808
releaseVersion = '2.8.10'
releaseVersionCode = 2810
// Important: ExoPlayer specifies a minSdkVersion of 14 because various
// components provided by the library may be of use on older devices.
// However, please note that the core media playback functionality provided
// by the library requires API level 16 or greater.
minSdkVersion = 26
minSdkVersion = 24
targetSdkVersion = 26
compileSdkVersion = 27
buildToolsVersion = '27.0.3'
Expand Down
17 changes: 5 additions & 12 deletions demos/main/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="2808"
android:versionName="2.8.8-Roger"
android:versionCode="2810"
android:versionName="2.8.10"
package="com.foxsports.worldcup.streamtest">

<uses-permission android:name="android.permission.INTERNET"/>
Expand Down Expand Up @@ -44,21 +44,14 @@
android:configChanges="keyboardHidden"
android:label="@string/application_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>

<data android:scheme="http"/>
<data android:scheme="https"/>
<data android:scheme="content"/>
<data android:scheme="asset"/>
<data android:scheme="file"/>
<data android:host="*"/>
<data android:pathPattern=".*\\.exolist\\.json"/>
/>
</intent-filter>
</activity>

Expand Down
1 change: 0 additions & 1 deletion demos/main/src/main/assets/media.exolist.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"name": "️4️⃣7️⃣ 🇯🇵 🆚 🇵🇱 🎞 ",
"uri": "https://fifa2018-i.akamaihd.net/hls/replay/652796/108586-fox/master.m3u8"
},
{
{
"name": "️4️⃣8️⃣ 🇸🇳 🆚 🇨🇴 🎞 ",
"uri": "https://fifa2018-i.akamaihd.net/hls/replay/664059/108587-fox/master.m3u8"
Expand Down
50 changes: 25 additions & 25 deletions demos/main/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,50 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<string name="application_name">4️⃣𝐊📅⏰📺📡️⚽️🌏🇷🇺🏆🦊</string>
<string name="play_button">Play</string>
<string name="tokenize_button">🎟</string>
<string name="application_name">4️⃣𝐊📅⏰📺📡️⚽️🌏🇷🇺🏆🦊</string>
<string name="play_button">Play</string>
<string name="tokenize_button">🎟</string>

<string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
<string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>

<string name="error_generic">Playback failed</string>
<string name="error_generic">Playback failed</string>

<string name="error_unrecognized_abr_algorithm">Unrecognized ABR algorithm</string>
<string name="error_unrecognized_abr_algorithm">Unrecognized ABR algorithm</string>

<string name="error_drm_not_supported">Protected content not supported on API levels below 18</string>
<string name="error_drm_not_supported">Protected content not supported on API levels below 18</string>

<string name="error_drm_unsupported_scheme">This device does not support the required DRM scheme</string>
<string name="error_drm_unsupported_scheme">This device does not support the required DRM scheme</string>

<string name="error_drm_unknown">An unknown DRM error occurred</string>
<string name="error_drm_unknown">An unknown DRM error occurred</string>

<string name="error_no_decoder">This device does not provide a decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
<string name="error_no_decoder">This device does not provide a decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>

<string name="error_no_secure_decoder">This device does not provide a secure decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
<string name="error_no_secure_decoder">This device does not provide a secure decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>

<string name="error_querying_decoders">Unable to query device decoders</string>
<string name="error_querying_decoders">Unable to query device decoders</string>

<string name="error_instantiating_decoder">Unable to instantiate decoder <xliff:g id="decoder_name">%1$s</xliff:g></string>
<string name="error_instantiating_decoder">Unable to instantiate decoder <xliff:g id="decoder_name">%1$s</xliff:g></string>

<string name="error_unsupported_video">Media includes video tracks, but none are playable by this device</string>
<string name="error_unsupported_video">Media includes video tracks, but none are playable by this device</string>

<string name="error_unsupported_audio">Media includes audio tracks, but none are playable by this device</string>
<string name="error_unsupported_audio">Media includes audio tracks, but none are playable by this device</string>

<string name="storage_permission_denied">Permission to access storage was denied</string>
<string name="storage_permission_denied">Permission to access storage was denied</string>

<string name="sample_list_load_error">One or more sample lists failed to load</string>
<string name="sample_list_load_error">One or more sample lists failed to load</string>

<string name="tokenize_error">Tokenization request failed.</string>
<string name="tokenize_error">Tokenization request failed.</string>

<string name="ima_not_loaded">Playing without ads, as the IMA extension was not loaded</string>
<string name="ima_not_loaded">Playing without ads, as the IMA extension was not loaded</string>

<string name="download_start_error">Failed to start download</string>
<string name="download_start_error">Failed to start download</string>

<string name="download_playlist_unsupported">This app does not support downloading playlists</string>
<string name="download_playlist_unsupported">This app does not support downloading playlists</string>

<string name="download_drm_unsupported">This app does not support downloading protected content</string>
<string name="download_drm_unsupported">This app does not support downloading protected content</string>

<string name="download_scheme_unsupported">This app only supports downloading http streams</string>
<string name="download_scheme_unsupported">This app only supports downloading http streams</string>

<string name="download_ads_unsupported">IMA does not support offline ads</string>
<string name="download_ads_unsupported">IMA does not support offline ads</string>

</resources>
</resources>

0 comments on commit 064ea78

Please sign in to comment.