summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Santiago Seifert <aquilescanta@google.com> 2020-04-28 20:35:39 +0100
committer Santiago Seifert <aquilescanta@google.com> 2020-05-13 13:28:34 +0100
commit56070b5299b8dc64746c895f454106695e0b10cb (patch)
treec4d7dc943e20d40816abc556c414718b4cf284b6
parentf633705ae21f03188caff3c180158b6f9fdf4f7f (diff)
Throw when trying to create MediaParser before R
Bug: 147586901 Test: atest CtsMediaParserTestCases Test: Manually tested. Change-Id: I17567905c20f86ce53c60cf9888e8bf4034b1b96
-rw-r--r--apex/media/framework/java/android/media/MediaParser.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java
index c3adf6044655..ddecfed68d9b 100644
--- a/apex/media/framework/java/android/media/MediaParser.java
+++ b/apex/media/framework/java/android/media/MediaParser.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.StringDef;
import android.media.MediaCodec.CryptoInfo;
+import android.os.Build;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
@@ -1099,6 +1100,9 @@ public final class MediaParser {
// Private methods.
private MediaParser(OutputConsumer outputConsumer, boolean sniff, String... parserNamesPool) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+ throw new UnsupportedOperationException("Android version must be R or greater.");
+ }
mParserParameters = new HashMap<>();
mOutputConsumer = outputConsumer;
mParserNamesPool = parserNamesPool;