From 56070b5299b8dc64746c895f454106695e0b10cb Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Tue, 28 Apr 2020 20:35:39 +0100
Subject: [PATCH] Throw when trying to create MediaParser before R

Bug: 147586901
Test: atest CtsMediaParserTestCases
Test: Manually tested.
Change-Id: I17567905c20f86ce53c60cf9888e8bf4034b1b96
---
 apex/media/framework/java/android/media/MediaParser.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java
index c3adf6044655b..ddecfed68d9ba 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;