Merge "Fix encryption/decryption of large blocks." into qt-dev (3074669a) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -162,16 +162,16 @@ class KeyStoreCryptoOperationChunkedStreamer implements KeyStoreCryptoOperationS
		}

		if ((opResult.output != null) && (opResult.output.length > 0)) {
		if (inputLength > 0) {
		if (inputLength + mBufferedLength > 0) {
		// More output might be produced in this loop -- buffer the current output
		if (bufferedOutput == null) {
		bufferedOutput = new ByteArrayOutputStream();
		}
		try {
		bufferedOutput.write(opResult.output);
		} catch (IOException e) {
		throw new ProviderException("Failed to buffer output", e);
		}
		}
		} else {
		// No more output will be produced in this loop
		byte[] result;