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

Revert "Use aidl interface for Widevine service."

Browse Source 
This reverts commit 96a8ccd4a1.

Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed

Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6
This commit is contained in:
Yohei Yukawa
2022-01-31 22:01:25 +00:00
parent 96a8ccd4a1
commit a4d835af3a
75 changed files with 1480 additions and 7078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libwvdrmengine/level3/x86/libl3oemcrypto.cpp
View File

@@ -66730,7 +66730,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
szfrtdzv(12) = nmvfyrzi;
if (!szfrtdzv(12)) goto ooscusvc;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_ERROR,
wvutil::Log("", "", 0, wvutil::LOG_ERROR,
"Initialize without previous terminate.");
delete nmvfyrzi;
}
@@ -66742,7 +66742,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
szfrtdzv(11) = !nmvfyrzi;
if (!szfrtdzv(11)) goto rguuqwia;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_ERROR,
wvutil::Log("", "", 0, wvutil::LOG_ERROR,
"Memory Full. Cannot initialize.");
return OEMCrypto_ERROR_INIT_FAILED;
}
@@ -66751,7 +66751,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
}
nmvfyrzi->saafjqyv();
nmvfyrzi->vsooeshx(false);
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"Level3 Library "
"22595"
" "
@@ -71882,7 +71882,7 @@ OEMCryptoResult wvoec3::Level3_Terminate(void) {
{
szfrtdzv(11) = gwajusko(1) != OEMCrypto_SUCCESS;
if (!szfrtdzv(11)) goto movuujnv;
{ wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO, "L3 has leaked memory."); }
{ wvutil::Log("", "", 0, wvutil::LOG_INFO, "L3 has leaked memory."); }
movuujnv:;
}
@@ -71895,12 +71895,12 @@ OEMCryptoResult wvoec3::Level3_Terminate(void) {
nmvfyrzi->vsooeshx(false);
delete nmvfyrzi;
nmvfyrzi = nullptr;
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO, "L3 Terminate.");
wvutil::Log("", "", 0, wvutil::LOG_INFO, "L3 Terminate.");
}
goto ofvfedfj;
hiohtepc:;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"L3 Terminate without initialize.");
}
ofvfedfj:;
@@ -72084,7 +72084,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
(*urhzeplu(0)).buffers.input_data_length == 0;
if (!szfrtdzv(4)) goto mvrppfig;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"Level3_DecryptCENC(): OEMCrypto_ERROR_INVALID_CONTEXT.");
return OEMCrypto_ERROR_INVALID_CONTEXT;
}
@@ -72137,7 +72137,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
szfrtdzv(13) = dhbggeeb(22) != (*urhzeplu(0)).buffers.input_data_length;
if (!szfrtdzv(13)) goto sbiqucjq;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"Level3_DecryptCENC(): Sample and subsample lengths do "
"not match.");
return OEMCrypto_ERROR_INVALID_CONTEXT;
@@ -73095,12 +73095,12 @@ OEMCryptoResult wvoec3::Level3_LoadCasECMKeys(
OEMCryptoResult wvoec3::Level3_ProductionReady() { return OEMCrypto_SUCCESS; }
OEMCryptoResult wvoec3::Level3_Idle(OEMCrypto_IdleState lohuxnvn,
uint32_t ioulgnsj) {
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"no OEMCrypto activity for some time so entering idle state");
return OEMCrypto_SUCCESS;
}
OEMCryptoResult wvoec3::Level3_Wake() {
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO, "OEMCrypto operations resuming");
wvutil::Log("", "", 0, wvutil::LOG_INFO, "OEMCrypto operations resuming");
return OEMCrypto_SUCCESS;
}
OEMCryptoResult wvoec3::Level3_ReuseUsageEntry(OEMCrypto_SESSION pzfszjmn,