Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8966b961 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I7f761408e1986fb46a6667813cf7da0c68a98a9c
parents fdd0e761 de2d4c29

apex/media/framework/java/android/media/MediaParser.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -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;