Upload Ed Schacker's fix for ANR on expired assets
Bug: 5207528 Change-Id: I59b531d744da2046bb0698c4e45f031c3c476114
This commit is contained in:
@@ -858,7 +858,7 @@ status_t WVMDrmPlugin::onDecrypt(int uniqueId, DecryptHandle* decryptHandle, int
|
|||||||
status = mDrmPluginImpl->Operate(encBuffer->data, (*decBuffer)->data, encBuffer->length, iv);
|
status = mDrmPluginImpl->Operate(encBuffer->data, (*decBuffer)->data, encBuffer->length, iv);
|
||||||
if (status != WVDRMPluginAPI::RIGHTS_VALID) {
|
if (status != WVDRMPluginAPI::RIGHTS_VALID) {
|
||||||
(*decBuffer)->length = 0;
|
(*decBuffer)->length = 0;
|
||||||
usleep(1000000); // prevent spinning
|
usleep(1000); // prevent spinning
|
||||||
if (status == WVDRMPluginAPI::RIGHTS_NOT_ACQUIRED) {
|
if (status == WVDRMPluginAPI::RIGHTS_NOT_ACQUIRED) {
|
||||||
return DRM_ERROR_NO_LICENSE;
|
return DRM_ERROR_NO_LICENSE;
|
||||||
} else if (status == WVDRMPluginAPI::RIGHTS_EXPIRED) {
|
} else if (status == WVDRMPluginAPI::RIGHTS_EXPIRED) {
|
||||||
|
|||||||
Reference in New Issue
Block a user