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

Merge "Complete CryptoInfo.toString" into rvc-dev

Browse Source
This commit is contained in:
Santiago Seifert
2020-05-28 16:21:19 +00:00
committed by Android (Google) Code Review
parent 29dfff4228 e5cc58f3a3
commit a5dc451305
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/MediaCodec.java
View File

@@ -2742,6 +2742,9 @@ final public class MediaCodec {
* See {@link MediaCodec.CryptoInfo.Pattern}. * See {@link MediaCodec.CryptoInfo.Pattern}.
*/ */
public void setPattern(Pattern newPattern) { public void setPattern(Pattern newPattern) {
if (newPattern == null) {
newPattern = zeroPattern;
}
pattern = newPattern; pattern = newPattern;
} }
@@ -2767,6 +2770,11 @@ final public class MediaCodec {
builder.append(Arrays.toString(numBytesOfClearData)); builder.append(Arrays.toString(numBytesOfClearData));
builder.append(", encrypted "); builder.append(", encrypted ");
builder.append(Arrays.toString(numBytesOfEncryptedData)); 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(); return builder.toString();
} }
}; };