summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-06-24 17:13:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-24 17:13:26 +0000
commit39be5b6a43f2e036b117eb9ee59526e15a62b522 (patch)
treee0f4885726f712549dba664a7751b158395783c8
parent571f7b76b05975aa8896fd552f70963a0e72f062 (diff)
parenta79ec4979e5043bcfeee783c99ced789147bd4de (diff)
Merge "Fix CryptoInfo.toString" into rvc-dev am: 4b23ea8b74 am: a79ec4979e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11986780 Change-Id: Ie95c17acc4db04c60614e77e999e1e51b8d1b99f
-rw-r--r--media/java/android/media/MediaCodec.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index 62d76c0d2d58..0780c6875eb5 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));
}