Ensure the demo app requests local-file permissions for subtitle files

Currently we only do this for the main sample URI, not for subtitles.
So pairing a web-based video file with a local subtitle file on a fresh
install just throws a 'permission denied' exception.

PiperOrigin-RevId: 290794091
This commit is contained in:
ibaker 2020-01-21 20:04:08 +00:00 committed by Oliver Woodman
parent b59a1b89e3
commit d1703ad68c

View file

@ -432,6 +432,11 @@ public class PlayerActivity extends AppCompatActivity
mediaSources[i] = createLeafMediaSource(samples[i]);
Sample.SubtitleInfo subtitleInfo = samples[i].subtitleInfo;
if (subtitleInfo != null) {
if (Util.maybeRequestReadExternalStoragePermission(
/* activity= */ this, subtitleInfo.uri)) {
// The player will be reinitialized if the permission is granted.
return Collections.emptyList();
}
Format subtitleFormat =
Format.createTextSampleFormat(
/* id= */ null,