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

7
libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
View File

@@ -4,10 +4,7 @@
#include <errno.h>
#include <getopt.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <limits.h>
#include <utils/Thread.h>
#include <sstream>
@@ -287,7 +284,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
CdmAppParameterMap app_parameters;
CdmKeyRequest key_request;
const std::string init_data_type = "video/mp4";
if (wvutil::g_cutoff >= wvutil::CDM_LOG_DEBUG) {
if (wvutil::g_cutoff >= wvutil::LOG_DEBUG) {
InitializationData parsed_init_data(init_data_type, init_data);
parsed_init_data.DumpToLogs();
}
@@ -684,7 +681,7 @@ class WvCdmExtendedDurationTest : public WvCdmTestBase {
EXPECT_TRUE(StringToInt64(query_info[key], playback_duration_remaining));
}
uint32_t QueryStatus(RequestedSecurityLevel security_level, const std::string& key) {
uint32_t QueryStatus(SecurityLevel security_level, const std::string& key) {
std::string str;
EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus(security_level, key, &str));

8
libwvdrmengine/cdm/test/cdm_feature_test.cpp
View File

@@ -17,14 +17,14 @@
// CDM functionality across a broad range of OEMCrypto implementations
// and are not intended to be run by partners.
#include <cutils/properties.h>
#include <errno.h>
#include <getopt.h>
#include <sstream>
#include <cutils/properties.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
#include <sstream>
#include "OEMCryptoCENC.h"
#include "arraysize.h"
#include "config_test_env.h"
@@ -338,7 +338,7 @@ class WvCdmFeatureTest : public WvCdmTestBase {
CdmKeyRequest key_request;
std::string key_set_id;
license_type_ = license_type;
if (wvutil::g_cutoff >= wvutil::CDM_LOG_DEBUG) {
if (wvutil::g_cutoff >= wvutil::LOG_DEBUG) {
InitializationData parsed_init_data(init_data_type, init_data);
parsed_init_data.DumpToLogs();
}

2
libwvdrmengine/cdm/test/coverage-test.mk
View File

@@ -55,7 +55,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils_hidl \
libcdm_utils \
libjsmn \
libgmock \
libgtest \

2
libwvdrmengine/cdm/test/integration-test.mk
View File

@@ -45,7 +45,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils_hidl \
libcdm_utils \
libjsmn \
libgmock \
libgtest \

11
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -603,7 +603,7 @@ SessionSharingSubSampleInfo session_sharing_sub_samples[] = {
struct UsageInfoSubSampleInfo {
SubSampleInfo* sub_sample;
uint32_t usage_info;
wvcdm::RequestedSecurityLevel security_level;
wvcdm::SecurityLevel security_level;
std::string app_id;
};
@@ -1757,7 +1757,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
CdmKeyRequest key_request;
std::string key_set_id;
license_type_ = license_type;
if (wvutil::g_cutoff >= wvutil::CDM_LOG_DEBUG) {
if (wvutil::g_cutoff >= wvutil::LOG_DEBUG) {
InitializationData parsed_init_data(init_data_type, init_data);
parsed_init_data.DumpToLogs();
}
@@ -1982,7 +1982,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
}
bool IsProvisioned(const CdmIdentifier& identifier,
RequestedSecurityLevel requested_security_level) {
SecurityLevel requested_security_level) {
TestWvCdmClientPropertySet property_set_L3;
TestWvCdmClientPropertySet* property_set = nullptr;
@@ -2018,7 +2018,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
void Provision() { Provision(kDefaultCdmIdentifier, kLevelDefault); }
void Provision(const CdmIdentifier& identifier,
RequestedSecurityLevel requested_security_level,
SecurityLevel requested_security_level,
CdmProvisioningResponse* provisioning_response = nullptr) {
TestWvCdmClientPropertySet property_set_L3;
TestWvCdmClientPropertySet* property_set = nullptr;
@@ -2086,8 +2086,7 @@ class WvCdmRequestLicenseTest : public WvCdmTestBase {
return security_level;
}
uint32_t QueryStatus(RequestedSecurityLevel security_level,
const std::string& key) {
uint32_t QueryStatus(SecurityLevel security_level, const std::string& key) {
std::string str;
EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus(security_level, key, &str));

2
libwvdrmengine/cdm/test/unit-test.mk
View File

@@ -42,7 +42,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
LOCAL_STATIC_LIBRARIES := \
libcdm \
libcdm_protos \
libcdm_utils_hidl \
libcdm_utils \
libjsmn \
libgmock \
libgtest \