Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Throw when trying to create MediaParser before R" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-14 11:09:43 +00:00
committed by Android (Google) Code Review
parent bee7404dcc 56070b5299
commit de2d4c29ef
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/media/framework/java/android/media/MediaParser.java
View File

@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.StringDef; import android.annotation.StringDef;
import android.media.MediaCodec.CryptoInfo; import android.media.MediaCodec.CryptoInfo;
import android.os.Build;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
@@ -1099,6 +1100,9 @@ public final class MediaParser {
// Private methods. // Private methods.
private MediaParser(OutputConsumer outputConsumer, boolean sniff, String... parserNamesPool) { 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<>(); mParserParameters = new HashMap<>();
mOutputConsumer = outputConsumer; mOutputConsumer = outputConsumer;
mParserNamesPool = parserNamesPool; mParserNamesPool = parserNamesPool;