From 3c715d5778e15dc84082e63dc65b382d31fe8e45 Mon Sep 17 00:00:00 2001 From: Santiago Seifert Date: Wed, 24 Jun 2020 14:58:47 +0100 Subject: [PATCH] Fix CryptoInfo.toString It's using the key length when it should use the iv length. Bug: 154120292 Test: Manually. Change-Id: I98d71b974688acbeef0c7112298c5edf37d47ef7 --- media/java/android/media/MediaCodec.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 62d76c0d2d583..0780c6875eb5a 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -2762,7 +2762,7 @@ final public class MediaCodec { builder.append(hexdigits.charAt(key[i] & 0x0f)); } builder.append("], iv ["); - for (int i = 0; i < key.length; i++) { + for (int i = 0; i < iv.length; i++) { builder.append(hexdigits.charAt((iv[i] & 0xf0) >> 4)); builder.append(hexdigits.charAt(iv[i] & 0x0f)); }