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

Commit cbb3d153 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0 SPI: Fix bug in chunked streamer." am: 3af57cab am: 4b1f565f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c8004df6a99e86e80b0d6476ed70c28d13a6932
parents d5954392 4b1f565f

keystore/java/android/security/keystore2/KeyStoreCryptoOperationChunkedStreamer.java

+3 −1
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ class KeyStoreCryptoOperationChunkedStreamer implements KeyStoreCryptoOperationS 
            int inputConsumed = ArrayUtils.copy(input, inputOffset, mChunk, mChunkLength,

                    inputLength);

            inputLength -= inputConsumed;

            inputOffset += inputOffset;

            inputOffset += inputConsumed;

            mChunkLength += inputConsumed;

            if (mChunkLength < mChunkSizeMax) return output;

            byte[] o = mKeyStoreStream.update(mChunk);

            if (o != null) {

                output = ArrayUtils.concat(output, o);