From 4c1fb0c9772fa76dc6e7695ee904a337cc56167c Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Thu, 23 Jul 2015 13:12:57 +0100 Subject: [PATCH] Don't catch API 19 exception from newInstance. --- .../android/exoplayer/extractor/ExtractorSampleSource.java | 4 +++- .../com/google/android/exoplayer/text/TextTrackRenderer.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java index 72dad1f667..016f800e44 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java @@ -247,7 +247,9 @@ public class ExtractorSampleSource implements SampleSource, SampleSourceReader, for (int i = 0; i < extractors.length; i++) { try { extractors[i] = DEFAULT_EXTRACTOR_CLASSES.get(i).newInstance(); - } catch (ReflectiveOperationException e) { + } catch (InstantiationException e) { + throw new IllegalStateException("Unexpected error creating default extractor", e); + } catch (IllegalAccessException e) { throw new IllegalStateException("Unexpected error creating default extractor", e); } } diff --git a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java index 27019c82ab..51fb6e263e 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java @@ -141,7 +141,9 @@ public class TextTrackRenderer extends TrackRenderer implements Callback { for (int i = 0; i < subtitleParsers.length; i++) { try { subtitleParsers[i] = DEFAULT_PARSER_CLASSES.get(i).newInstance(); - } catch (ReflectiveOperationException e) { + } catch (InstantiationException e) { + throw new IllegalStateException("Unexpected error creating default parser", e); + } catch (IllegalAccessException e) { throw new IllegalStateException("Unexpected error creating default parser", e); } }