Revert "Use aidl interface for Widevine service."
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:
@@ -72595,7 +72595,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
|
||||
xrgxvare(13) = evxhbbos;
|
||||
if (!xrgxvare(13)) goto fibxerat;
|
||||
{
|
||||
wvutil::Log("", "", 0, wvutil::CDM_LOG_ERROR,
|
||||
wvutil::Log("", "", 0, wvutil::LOG_ERROR,
|
||||
"Initialize without previous terminate.");
|
||||
delete evxhbbos;
|
||||
}
|
||||
@@ -72607,7 +72607,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
|
||||
xrgxvare(12) = !evxhbbos;
|
||||
if (!xrgxvare(12)) goto ppgvdvfm;
|
||||
{
|
||||
wvutil::Log("", "", 0, wvutil::CDM_LOG_ERROR,
|
||||
wvutil::Log("", "", 0, wvutil::LOG_ERROR,
|
||||
"Memory Full. Cannot initialize.");
|
||||
return OEMCrypto_ERROR_INIT_FAILED;
|
||||
}
|
||||
@@ -72616,7 +72616,7 @@ OEMCryptoResult wvoec3::Level3_Initialize() {
|
||||
}
|
||||
evxhbbos->kmaibvqt();
|
||||
evxhbbos->kqpwykfh(false);
|
||||
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
|
||||
wvutil::Log("", "", 0, wvutil::LOG_INFO,
|
||||
"Level3 Library "
|
||||
"22593"
|
||||
" "
|
||||
@@ -77747,7 +77747,7 @@ OEMCryptoResult wvoec3::Level3_Terminate(void) {
|
||||
{
|
||||
xrgxvare(12) = ewwjqjme(1) != OEMCrypto_SUCCESS;
|
||||
if (!xrgxvare(12)) goto djhfqfxp;
|
||||
{ wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO, "L3 has leaked memory."); }
|
||||
{ wvutil::Log("", "", 0, wvutil::LOG_INFO, "L3 has leaked memory."); }
|
||||
|
||||
djhfqfxp:;
|
||||
}
|
||||
@@ -77760,12 +77760,12 @@ OEMCryptoResult wvoec3::Level3_Terminate(void) {
|
||||
evxhbbos->kqpwykfh(false);
|
||||
delete evxhbbos;
|
||||
evxhbbos = nullptr;
|
||||
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO, "L3 Terminate.");
|
||||
wvutil::Log("", "", 0, wvutil::LOG_INFO, "L3 Terminate.");
|
||||
}
|
||||
goto qdcypvbj;
|
||||
wfvnghij:;
|
||||
{
|
||||
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
|
||||
wvutil::Log("", "", 0, wvutil::LOG_INFO,
|
||||
"L3 Terminate without initialize.");
|
||||
}
|
||||
qdcypvbj:;
|
||||
@@ -77949,7 +77949,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
|
||||
(*ugqnlazh(0)).buffers.input_data_length == 0;
|
||||
if (!xrgxvare(7)) goto tjmfvaju;
|
||||
{
|
||||
wvutil::Log("", "", 0, wvutil::CDM_LOG_INFO,
|
||||
wvutil::Log("", "", 0, wvutil::LOG_INFO,
|
||||
"Level3_DecryptCENC(): OEMCrypto_ERROR_INVALID_CONTEXT.");
|
||||
return OEMCrypto_ERROR_INVALID_CONTEXT;
|
||||
}
|
||||
@@ -78002,7 +78002,7 @@ OEMCryptoResult wvoec3::Level3_DecryptCENC(
|
||||
xrgxvare(5) = tjhqotav(22) != (*ugqnlazh(0)).buffers.input_data_length;
|
||||
if (!xrgxvare(5)) goto uezzvian;
|
||||
{
|
||||
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;
|
||||
@@ -78960,12 +78960,12 @@ OEMCryptoResult wvoec3::Level3_LoadCasECMKeys(
|
||||
OEMCryptoResult wvoec3::Level3_ProductionReady() { return OEMCrypto_SUCCESS; }
|
||||
OEMCryptoResult wvoec3::Level3_Idle(OEMCrypto_IdleState gkteiphb,
|
||||
uint32_t qpqkutxg) {
|
||||
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 rqogldqg,
|
||||
|
||||
Reference in New Issue
Block a user