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

Commit 5dbeb412 authored by Santiago Seifert's avatar Santiago Seifert Committed by Automerger Merge Worker
Browse files

Merge "Complete CryptoInfo.toString" into rvc-dev am: a5dc4513 am: 39035922 

Change-Id: I2a1a48c3b230da0438259c39ecb81738770dda21
parents 530c93e1 39035922

media/java/android/media/MediaCodec.java

+8 −0
Original line number Diff line number Diff line
@@ -2742,6 +2742,9 @@ final public class MediaCodec { 
         * See {@link MediaCodec.CryptoInfo.Pattern}.

         */

        public void setPattern(Pattern newPattern) {

            if (newPattern == null) {

                newPattern = zeroPattern;

            }

            pattern = newPattern;

        }
@@ -2767,6 +2770,11 @@ final public class MediaCodec { 
            builder.append(Arrays.toString(numBytesOfClearData));

            builder.append(", encrypted ");

            builder.append(Arrays.toString(numBytesOfEncryptedData));

            builder.append(", pattern (encrypt: ");

            builder.append(pattern.mEncryptBlocks);

            builder.append(", skip: ");

            builder.append(pattern.mSkipBlocks);

            builder.append(")");

            return builder.toString();

        }

    };