Handle KEY_NOT_LOADED error
Merge from Widevine repo of http://go/wvgerrit/56523 In OEMCrypto v14, SelectKey can also return KEY_NOT_LOADED if the key id is not found. This was added to help with entitlement licenses. However, SelectKey in crypto session converts this to an unknown error. In this CL we change that to a NO_CONTENT_KEY_3 error. This is probably only important because the generic crypto tests expect NO_CONTENT_KEY_3 when we try to use an undefined key. Test: existing unit tests pass, and some future unit tests pass. Bug: 72354901 Turn on generic crypto tests Change-Id: I3c0b7e6306cafd3feabc8aac7e47983c89194a26
This commit is contained in:
@@ -27,6 +27,7 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
|
||||
case wvcdm::DECRYPT_NOT_READY:
|
||||
case wvcdm::KEY_NOT_FOUND_IN_SESSION:
|
||||
case wvcdm::NO_MATCHING_ENTITLEMENT_KEY:
|
||||
case wvcdm::NO_CONTENT_KEY_3:
|
||||
return android::ERROR_DRM_NO_LICENSE;
|
||||
case wvcdm::NEED_PROVISIONING:
|
||||
return android::ERROR_DRM_NOT_PROVISIONED;
|
||||
|
||||
Reference in New Issue
Block a user