diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-24 17:42:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 17:42:59 +0000 |
| commit | e7595723dd9ef5879ef3e55042860c249efc0407 (patch) | |
| tree | 9f07ab00bb6b06131bad1f2effe38e4a7be0c138 /media/java/android/media/MediaCodec.java | |
| parent | b6ea2378e242c2d5d6f39c766d424fd3f072cca7 (diff) | |
| parent | f6f58cce56f401ed59632aff6a745dcb818b0e94 (diff) | |
Merge "Fix CryptoInfo.toString" into rvc-dev am: 4b23ea8b74 am: a79ec4979e am: d8e4e24521 am: f6f58cce56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11986780
Change-Id: I4f2c5014e1b4b0dd88a8d93b9efc848c46b57ae4
Diffstat (limited to 'media/java/android/media/MediaCodec.java')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 01b7b0fb5de1..0747ab13981e 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -2763,7 +2763,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)); } |