Merge "Complete CryptoInfo.toString" into rvc-dev am: a5dc451305 am:... (227a28f1) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaCodec.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -2743,6 +2743,9 @@ final public class MediaCodec {
		* See {@link MediaCodec.CryptoInfo.Pattern}.
		*/
		public void setPattern(Pattern newPattern) {
		if (newPattern == null) {
		newPattern = zeroPattern;
		}
		pattern = newPattern;
		}

		@@ -2768,6 +2771,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();
		}
		};