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

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

+6 −6

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

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