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
(cherry picked from commit a4d835af3a)
Merged-In:I9c42df15defec428c9ef8c62439c63d4a603fee6
This commit is contained in:
Yohei Yukawa
2022-01-31 22:01:25 +00:00
committed by Android Build Coastguard Worker
parent 6e50c60bf7
commit 860a48ff8c
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_64/libl3oemcrypto.cpp
View File

@@ -62865,7 +62865,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
yajyytmy(13) = ovbbknls;
if (!yajyytmy(13)) goto hqlrxfcz;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_ERROR,
wvutil::Log("", "", 0, wvutil::LOG_ERROR,
"Initialize without previous terminate.");
delete ovbbknls;
}
@@ -62877,7 +62877,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
yajyytmy(5) = !ovbbknls;
if (!yajyytmy(5)) goto xwhrnftd;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_ERROR,
wvutil::Log("", "", 0, wvutil::LOG_ERROR,
"Memory Full. Cannot initialize.");
return OEMCrypto_ERROR_INIT_FAILED;
}
@@ -62886,7 +62886,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
}
ovbbknls->nwclxxvj();
ovbbknls->mnbuaxel(false);
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"Level3 Library "
"22596"
" "
@@ -68017,7 +68017,7 @@ OEMCryptoResult wvoec3::Level3_Terminate(void) {
{
yajyytmy(5) = rkajjimp(1) != OEMCrypto_SUCCESS;
if (!yajyytmy(5)) goto lvsgahqs;
{ wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO, "L3 has leaked memory."); }
{ wvutil::Log("", "", 0, wvutil::LOG_INFO, "L3 has leaked memory."); }
lvsgahqs:;
}
@@ -68030,12 +68030,12 @@ OEMCryptoResult wvoec3::Level3_Terminate(void) {
ovbbknls->mnbuaxel(false);
delete ovbbknls;
ovbbknls = nullptr;
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO, "L3 Terminate.");
wvutil::Log("", "", 0, wvutil::LOG_INFO, "L3 Terminate.");
}
goto ckgpauch;
qhvcurpv:;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"L3 Terminate without initialize.");
}
ckgpauch:;
@@ -68219,7 +68219,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
(*mpivwsum(0)).buffers.input_data_length == 0;
if (!yajyytmy(9)) goto cfwrzsev;
{
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
wvutil::Log("", "", 0, wvutil::LOG_INFO,
"Level3_DecryptCENC(): OEMCrypto_ERROR_INVALID_CONTEXT.");
return OEMCrypto_ERROR_INVALID_CONTEXT;
}
@@ -68272,7 +68272,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
yajyytmy(7) = thhxkhfm(21) != (*mpivwsum(0)).buffers.input_data_length;
if (!yajyytmy(7)) goto sdxbdfdf;
{
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;
@@ -69230,12 +69230,12 @@ OEMCryptoResult wvoec3::Level3_LoadCasECMKeys(
OEMCryptoResult wvoec3::Level3_ProductionReady() { return OEMCrypto_SUCCESS; }
OEMCryptoResult wvoec3::Level3_Idle(OEMCrypto_IdleState djppgavo,
uint32_t xyxxpcdk) {
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 ufkscvvu,