sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Demo app: Do not allow tunneling on API < 21

Browse source 
Without this patch, enabling tunneling on an API < 21 device
would result in an method not existing exception and the
app would crash.

PiperOrigin-RevId: 275428851
This commit is contained in:
krocard 2019-10-18 09:43:15 +01:00 committed by Oliver Woodman
parent 16a6946f3e
commit 6841d40bc7
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View file

@ -206,7 +206,7 @@ public class PlayerActivity extends AppCompatActivity
DefaultTrackSelector.ParametersBuilder builder = DefaultTrackSelector.ParametersBuilder builder =
new DefaultTrackSelector.ParametersBuilder(/* context= */ this); new DefaultTrackSelector.ParametersBuilder(/* context= */ this);
boolean tunneling = intent.getBooleanExtra(TUNNELING, false); boolean tunneling = intent.getBooleanExtra(TUNNELING, false);
if (tunneling) { if (Util.SDK_INT >= 21 && tunneling) {
builder.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(/* context= */ this)); builder.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(/* context= */ this));
} }
trackSelectorParameters = builder.build(); trackSelectorParameters = builder.build();

3
demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
View file

@ -127,6 +127,9 @@ public class SampleChooserActivity extends AppCompatActivity
preferExtensionDecodersMenuItem.setVisible(useExtensionRenderers); preferExtensionDecodersMenuItem.setVisible(useExtensionRenderers);
randomAbrMenuItem = menu.findItem(R.id.random_abr); randomAbrMenuItem = menu.findItem(R.id.random_abr);
tunnelingMenuItem = menu.findItem(R.id.tunneling); tunnelingMenuItem = menu.findItem(R.id.tunneling);
if (Util.SDK_INT < 21) {
tunnelingMenuItem.setEnabled(false);
}
return true; return true;
} }