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

Snap for 6297453 from 3280164113 to sc-release

Browse Source 
Change-Id: I0cf0e8781e08855a17bc52f5120d1cbcfc1bbe6f
This commit is contained in:
android-build-team Robot
2020-03-15 23:15:07 +00:00
parent 6fd0ff0f7a 3280164113
commit 1a9fcfae0b
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
View File

@@ -227,6 +227,12 @@ CdmResponseType WvContentDecryptionModule::HandleProvisioningResponse(
CdmResponseType WvContentDecryptionModule::Unprovision( CdmResponseType WvContentDecryptionModule::Unprovision(
CdmSecurityLevel level, const CdmIdentifier& identifier) { CdmSecurityLevel level, const CdmIdentifier& identifier) {
CdmEngine* cdm_engine = EnsureCdmForIdentifier(identifier); CdmEngine* cdm_engine = EnsureCdmForIdentifier(identifier);
// Persistent state is deleted on unprovisioning. The L3 OEMCrypto device
// key may however remain in memory until |OEMCrypto_Terminate| is called.
// It is not regenerated until |OEMCrypto_Initialize| is called.
// Enable immediate OEMCrypto termination and re-initalization on
// unprovisioning.
CryptoSession::DisableDelayedTermination();
return cdm_engine->Unprovision(level); return cdm_engine->Unprovision(level);
} }

5
libwvdrmengine/level3/src/get_unique_id_android.cpp
View File

@@ -16,10 +16,7 @@ namespace wvoec3 {
const char *getUniqueID(size_t *len) { const char *getUniqueID(size_t *len) {
static std::string unique_id; static std::string unique_id;
unique_id = android::base::GetProperty("ro.serialno", ""); unique_id = android::base::GetProperty("ro.serialno", "0123456789abc");
if (unique_id.empty()) {
unique_id = android::base::GetProperty("net.hostname", "0123456789abc");
}
#if defined(IN_APP_FASTBALL) || defined(IN_APP_MOVIES) #if defined(IN_APP_FASTBALL) || defined(IN_APP_MOVIES)
unique_id += android::base::GetProperty("package.name", "com.google.inapp"); unique_id += android::base::GetProperty("package.name", "com.google.inapp");
#endif #endif

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

@@ -334,11 +334,13 @@ Return<void> WVDrmPlugin::openSession_1_1(
hidl_vec<uint8_t> hSessionId = toHidlVec(sessionId); hidl_vec<uint8_t> hSessionId = toHidlVec(sessionId);
if (Status::OK == status) { if (Status::OK == status) {
SecurityLevel currentSecurityLevel = SecurityLevel::UNKNOWN; SecurityLevel currentSecurityLevel = SecurityLevel::UNKNOWN;
Return<void> hResult = getSecurityLevel(hSessionId, [&](Status status, SecurityLevel hSecurityLevel) { Return<void> hResult = getSecurityLevel(
hSessionId, [&](Status gslStatus, SecurityLevel hSecurityLevel) {
currentSecurityLevel = hSecurityLevel; currentSecurityLevel = hSecurityLevel;
if (Status::OK != status || requestedLevel != hSecurityLevel) { if (Status::OK != gslStatus || requestedLevel != hSecurityLevel) {
ALOGE("Failed to open session with the requested security level=%d", requestedLevel); ALOGE("Failed to open session with the requested security level=%d", requestedLevel);
if (Status::OK != closeSession(hSessionId)) sessionId.clear(); closeSession(hSessionId);
sessionId.clear();
} }
}); });
if (!hResult.isOk() || (requestedLevel != currentSecurityLevel)) { if (!hResult.isOk() || (requestedLevel != currentSecurityLevel)) {