widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for b/8594163 [SelectContentKey(): No key matches key id]

Browse Source 
...when playing clear parts of encrypted content.

Change-Id: I5fb027d22212f07b43deced2da77c98cb3800e7f
This commit is contained in:
Jeff Tinker
2013-04-11 14:14:55 -07:00
parent 3711ca87ae
commit 2f980d7d7e
4 changed files with 109 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -138,12 +138,14 @@ CdmResponseType CdmSession::Decrypt(bool is_encrypted,
return UNKNOWN_ERROR;
// Check if key needs to be selected
if (key_id_.compare(key_id) != 0) {
if (crypto_session_->SelectKey(key_id)) {
key_id_ = key_id;
}
else {
return UNKNOWN_ERROR;
if (is_encrypted) {
if (key_id_.compare(key_id) != 0) {
if (crypto_session_->SelectKey(key_id)) {
key_id_ = key_id;
}
else {
return UNKNOWN_ERROR;
}
}
}