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

Correct reporting of KeyStatus usable in future

Browse Source 
[ Merge of http://go/wvgerrit/98004 ]

This corrects mapping for KeyStatus event kKeyStatusUsableInFuture in
the legacy WVDrmPlugin. It earlier reported DrmPlugin KeyStatusType
kKeyStatusType_StatusPending and now reports kKeyStatusType_UsableInFuture.

This fixes the test failure WVDrmPluginTest.MarshalsEvents

Bug: 153509007
Bug: 116738851
Test: WV unit/integration tests
Change-Id: I4b2c74f5a0757975861ef41fa575a749ff9da391
This commit is contained in:
Rahul Frias
2020-04-14 10:58:24 -07:00
parent 4444ba3b47
commit 6404b42fb2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
View File

@@ -66,8 +66,9 @@ DrmPlugin::KeyStatusType ConvertFromCdmKeyStatus(CdmKeyStatus keyStatus) {
case kKeyStatusOutputNotAllowed: case kKeyStatusOutputNotAllowed:
return DrmPlugin::kKeyStatusType_OutputNotAllowed; return DrmPlugin::kKeyStatusType_OutputNotAllowed;
case kKeyStatusPending: case kKeyStatusPending:
case kKeyStatusUsableInFuture:
return DrmPlugin::kKeyStatusType_StatusPending; return DrmPlugin::kKeyStatusType_StatusPending;
case kKeyStatusUsableInFuture:
return DrmPlugin::kKeyStatusType_UsableInFuture;
case kKeyStatusInternalError: case kKeyStatusInternalError:
default: default:
return DrmPlugin::kKeyStatusType_InternalError; return DrmPlugin::kKeyStatusType_InternalError;