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

Merge "Correct reporting of KeyStatus usable in future" into rvc-dev am: d260c2cf2d am: dec9af442b am: c00f9a3ce1 am: 3bf1e1b1b5 am: ec919ed72a

Browse Source 
Change-Id: I4b78b4fbb9fae0a9de56a903df3784357ee12efa
This commit is contained in:
Rahul Frias
2020-04-20 20:38:33 +00:00
committed by Automerger Merge Worker
parent 5e696f4411 ec919ed72a
commit 7f880bcd0a
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:
return DrmPlugin::kKeyStatusType_OutputNotAllowed;
case kKeyStatusPending:
case kKeyStatusUsableInFuture:
return DrmPlugin::kKeyStatusType_StatusPending;
case kKeyStatusUsableInFuture:
return DrmPlugin::kKeyStatusType_UsableInFuture;
case kKeyStatusInternalError:
default:
return DrmPlugin::kKeyStatusType_InternalError;