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

Commit cec54082 authored by Wonsik Kim's avatar Wonsik Kim Committed by Automerger Merge Worker
Browse files

Merge changes from topic "skip-index-validation" into tm-qpr-dev-plus-aosp am: cf96cae3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19934118



Change-Id: If835e6b3225e0be31e8eab7cdb24413535f4269c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a022c550 cf96cae3

media/java/android/media/MediaCodec.java

+10 −14
Original line number Diff line number Diff line
@@ -3843,11 +3843,10 @@ final public class MediaCodec { 
    private void invalidateByteBufferLocked(

            @Nullable ByteBuffer[] buffers, int index, boolean input) {

        if (buffers == null) {

            if (index < 0) {

                throw new IllegalStateException("index is negative (" + index + ")");

            }

            if (index >= 0) {

                BitSet indices = input ? mValidInputIndices : mValidOutputIndices;

                indices.clear(index);

            }

        } else if (index >= 0 && index < buffers.length) {

            ByteBuffer buffer = buffers[index];

            if (buffer != null) {
@@ -3859,10 +3858,9 @@ final public class MediaCodec { 
    private void validateInputByteBufferLocked(

            @Nullable ByteBuffer[] buffers, int index) {

        if (buffers == null) {

            if (index < 0) {

                throw new IllegalStateException("index is negative (" + index + ")");

            }

            if (index >= 0) {

                mValidInputIndices.set(index);

            }

        } else if (index >= 0 && index < buffers.length) {

            ByteBuffer buffer = buffers[index];

            if (buffer != null) {
@@ -3876,11 +3874,10 @@ final public class MediaCodec { 
            @Nullable ByteBuffer[] buffers, int index, boolean input) {

        synchronized(mBufferLock) {

            if (buffers == null) {

                if (index < 0) {

                    throw new IllegalStateException("index is negative (" + index + ")");

                }

                if (index >= 0) {

                    BitSet indices = input ? mValidInputIndices : mValidOutputIndices;

                    indices.set(index);

                }

            } else if (index >= 0 && index < buffers.length) {

                ByteBuffer buffer = buffers[index];

                if (buffer != null) {
@@ -3893,10 +3890,9 @@ final public class MediaCodec { 
    private void validateOutputByteBufferLocked(

            @Nullable ByteBuffer[] buffers, int index, @NonNull BufferInfo info) {

        if (buffers == null) {

            if (index < 0) {

                throw new IllegalStateException("index is negative (" + index + ")");

            }

            if (index >= 0) {

                mValidOutputIndices.set(index);

            }

        } else if (index >= 0 && index < buffers.length) {

            ByteBuffer buffer = buffers[index];

            if (buffer != null) {