Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7595723 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CryptoInfo.toString" into rvc-dev am: 4b23ea8b am: a79ec497 am:... 

Merge "Fix CryptoInfo.toString" into rvc-dev am: 4b23ea8b am: a79ec497 am: d8e4e245 am: f6f58cce

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11986780

Change-Id: I4f2c5014e1b4b0dd88a8d93b9efc848c46b57ae4
parents b6ea2378 f6f58cce

media/java/android/media/MediaCodec.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

            }