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

Merge "Return key request type none after key rotation" into qt-dev am: 999a466275 am: 4690da2bcb

Browse Source 
am: 4c9a3a6f02

Change-Id: Iddcac699401f64d920fcb8ff73053410019ec028
This commit is contained in:
Rahul Frias
2019-05-31 09:55:31 -07:00
committed by android-build-merger
parent ecf8a96970 4c9a3a6f02
commit 6c9c4697f0
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -84,16 +84,15 @@ KeyRequestType ConvertFromCdmKeyRequestType(
KeyRequestType_V1_1 ConvertFromCdmKeyRequestType_1_1(
CdmKeyRequestType keyRequestType) {
/* TODO - What happened to these?
switch (keyRequestType) {
case wvcdm::kKeyRequestTypeNone:
return KeyRequestType_V1_1::NONE;
case wvcdm::kKeyRequestTypeUpdate:
return KeyRequestType_V1_1::UPDATE;
default:
*/
return static_cast<KeyRequestType_V1_1>(
ConvertFromCdmKeyRequestType(keyRequestType));
return static_cast<KeyRequestType_V1_1>(
ConvertFromCdmKeyRequestType(keyRequestType));
}
}
KeyRequestType toKeyRequestType_V1_0(KeyRequestType_V1_1 keyRequestType) {