Don\'t Validate Crypto Mode for Unencrypted Decrypt am: 6d2822f

am: 31a7567

* commit '31a75673b808410cc9236b708eec4b0bd0d0f187':
  Don't Validate Crypto Mode for Unencrypted Decrypt

Change-Id: Ia7cf310df94551888f64facd7988f608349d2fe1
This commit is contained in:
John "Juce" Bruce
2016-04-28 00:22:41 +00:00
committed by android-build-merger

View File

@@ -678,7 +678,7 @@ CdmResponseType CryptoSession::Decrypt(const CdmDecryptionParameters& params) {
params.encrypt_buffer, params.encrypt_length,
&buffer_descriptor, params.subsample_flags);
}
if (params.cipher_mode != cipher_mode_) {
if (params.is_encrypted && params.cipher_mode != cipher_mode_) {
return INCORRECT_CRYPTO_MODE;
}
if (params.is_encrypted || sts == OEMCrypto_ERROR_NOT_IMPLEMENTED) {