From e5cc58f3a3d1f1a8217e4f19115683e55e084eb6 Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Thu, 28 May 2020 14:18:25 +0100
Subject: [PATCH] Complete CryptoInfo.toString

Bug: 154120292
Test: presubmit
Change-Id: I67fdd5ad3cc327d5ab91aa1bfe3928c67463be8f
---
 media/java/android/media/MediaCodec.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index d6496c0b3e029..62d76c0d2d583 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -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();
         }
     };