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

OEMCrypto v16.1

Browse Source 
Merge of http://go/wvgerrit/93404

This CL updates the Widevine CDM to support OEMCrypto v16.1

Test: Tested in 16.2 CL
Bug: 141247171
Change-Id: I69bd993500f6fb63bf6010c8b0250dc7acc3d71b
This commit is contained in:
Fred Gylys-Colwell
2020-01-18 10:11:24 -08:00
parent 7e2619e379
commit 7665614b2e
132 changed files with 12331 additions and 9341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,8 @@
#include "WVDrmPlugin.h"
#include <endian.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <string>
#include <vector>
@@ -536,6 +536,10 @@ status_t WVDrmPlugin::getPropertyString(const String8& name,
mCDM->GetDecryptHashError(mDecryptHashSessionId, &hash_error_string);
value = hash_error_string.c_str();
return mapCdmResponseType(res);
} else if (name == "maxUsageEntriesSupported") {
return queryProperty(QUERY_KEY_MAX_USAGE_TABLE_ENTRIES, value);
} else if (name == "oemCryptoApiMinorVersion") {
return queryProperty(QUERY_KEY_OEMCRYPTO_API_MINOR_VERSION, value);
} else {
ALOGE("App requested unknown string property %s", name.string());
return android::ERROR_DRM_CANNOT_HANDLE;