loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix demo app NPE when selecting unsupported samples.

Browse Source 
PiperOrigin-RevId: 290027772
This commit is contained in:
tonihei 2020-01-16 10:32:41 +00:00 committed by Oliver Woodman
parent 090aed3aca
commit cf7b908e94
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View File

@ -82,6 +82,7 @@ import java.net.CookieHandler;
import java.net.CookieManager; import java.net.CookieManager;
import java.net.CookiePolicy; import java.net.CookiePolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
/** An activity that plays media using {@link SimpleExoPlayer}. */ /** An activity that plays media using {@link SimpleExoPlayer}. */
@ -405,7 +406,7 @@ public class PlayerActivity extends AppCompatActivity
if (!actionIsListView && !ACTION_VIEW.equals(action)) { if (!actionIsListView && !ACTION_VIEW.equals(action)) {
showToast(getString(R.string.unexpected_intent_action, action)); showToast(getString(R.string.unexpected_intent_action, action));
finish(); finish();
return null; return Collections.emptyList();
} }
Sample intentAsSample = Sample.createFromIntent(intent); Sample intentAsSample = Sample.createFromIntent(intent);
@ -419,17 +420,20 @@ public class PlayerActivity extends AppCompatActivity
seenAdsTagUri |= sample.adTagUri != null; seenAdsTagUri |= sample.adTagUri != null;
if (!Util.checkCleartextTrafficPermitted(sample.uri)) { if (!Util.checkCleartextTrafficPermitted(sample.uri)) {
showToast(R.string.error_cleartext_not_permitted); showToast(R.string.error_cleartext_not_permitted);
return null; return Collections.emptyList();
} }
if (Util.maybeRequestReadExternalStoragePermission(/* activity= */ this, sample.uri)) { if (Util.maybeRequestReadExternalStoragePermission(/* activity= */ this, sample.uri)) {
// The player will be reinitialized if the permission is granted. // The player will be reinitialized if the permission is granted.
return null; return Collections.emptyList();
} }
} }
List<MediaSource> mediaSources = new ArrayList<>(); List<MediaSource> mediaSources = new ArrayList<>();
for (UriSample sample : samples) { for (UriSample sample : samples) {
MediaSource mediaSource = createLeafMediaSource(sample); MediaSource mediaSource = createLeafMediaSource(sample);
if (mediaSource == null) {
continue;
}
Sample.SubtitleInfo subtitleInfo = sample.subtitleInfo; Sample.SubtitleInfo subtitleInfo = sample.subtitleInfo;
if (subtitleInfo != null) { if (subtitleInfo != null) {
Format subtitleFormat = Format subtitleFormat =
@ -467,6 +471,7 @@ public class PlayerActivity extends AppCompatActivity
return mediaSources; return mediaSources;
} }
@Nullable
private MediaSource createLeafMediaSource(UriSample parameters) { private MediaSource createLeafMediaSource(UriSample parameters) {
Sample.DrmInfo drmInfo = parameters.drmInfo; Sample.DrmInfo drmInfo = parameters.drmInfo;
int errorStringId = R.string.error_drm_unknown; int errorStringId = R.string.error_drm_unknown;
@ -602,7 +607,7 @@ public class PlayerActivity extends AppCompatActivity
try { try {
Class<?> loaderClass = Class.forName("com.google.android.exoplayer2.ext.ima.ImaAdsLoader"); Class<?> loaderClass = Class.forName("com.google.android.exoplayer2.ext.ima.ImaAdsLoader");
if (adsLoader == null) { if (adsLoader == null) {
// Full class names used so the LINT.IfChange rule triggers should any of the classes move. // Full class names used so the lint rule triggers should any of the classes move.
// LINT.IfChange // LINT.IfChange
Constructor<? extends AdsLoader> loaderConstructor = Constructor<? extends AdsLoader> loaderConstructor =
loaderClass loaderClass