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

Cherry pick 18.4 changes to udc-widevine-dev

Browse Source 
Get the udc-widevine-dev Android branch and oemcrypto-v18 cdm branch in
sync. The commit ID for 18.4 on oemcrypto-v18 is
https://widevine-internal.git.corp.google.com/cdm/+/a2f23a2281e5e06dc2867585bdc516fa132b639.

Merged from go/wvgerrit/190151

Bug: 290252845
Test: unit tests passing on Panther device
Change-Id: I63fa3f1c784f737ca1480e5febe4f3f5a8a49948
This commit is contained in:
Vicky Min
2024-02-01 19:18:44 +00:00
parent 540c8dfd50
commit 4129b3ac9f
48 changed files with 1491 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libwvdrmengine/cdm/src/properties_android.cpp
View File

@@ -2,19 +2,17 @@
// source code may only be used and distributed under the Widevine License
// Agreement.
#include "properties.h"
#include "properties_configuration.h"
#include "wv_android_build_id.h"
#include <android-base/properties.h>
#include <unistd.h>
#include <sstream>
#include <string>
#include <android-base/properties.h>
#include "log.h"
#include "wv_android_constants.h"
#include "properties.h"
#include "properties_configuration.h"
#include "widevine_apex_info.h"
#include "wv_android_constants.h"
namespace {
@@ -137,17 +135,15 @@ bool Properties::GetWVCdmVersion(std::string* version) {
return false;
}
std::string build_number;
std::string apex_version = "";
#ifdef __ANDROID_APEX__
{
auto info = widevine::apex::GetApexInfo();
build_number = std::to_string(info->version);
apex_version = "@" + std::to_string(info->version);
}
#else
build_number = WV_ANDROID_BUILD_ID;
#endif
*version = kWVAndroidCdmVersion + "@" + build_number;
*version = kWVAndroidCdmVersion + apex_version;
return true;
}

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

@@ -675,6 +675,10 @@ CdmResponseType WvContentDecryptionModule::SetDebugIgnoreKeyboxCount(
return CdmEngine::SetDebugIgnoreKeyboxCount(count);
}
CdmResponseType WvContentDecryptionModule::SetAllowTestKeybox(bool allow) {
return CdmEngine::SetAllowTestKeybox(allow);
}
CdmResponseType WvContentDecryptionModule::SetDecryptHash(
const std::string& hash_data, CdmSessionId* id) {
if (id == nullptr) {