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

4
libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp
View File

@@ -85,10 +85,10 @@ class MockCdmEngineImpl : public CdmEngine {
(const CdmSessionId&, CdmQueryMap*), (override));
MOCK_METHOD(CdmResponseType, GetProvisioningRequest,
(CdmCertificateType, const std::string&, const std::string&,
wvcdm::RequestedSecurityLevel, CdmProvisioningRequest*, std::string*),
SecurityLevel, CdmProvisioningRequest*, std::string*),
(override));
MOCK_METHOD(CdmResponseType, HandleProvisioningResponse,
(const CdmProvisioningResponse&, wvcdm::RequestedSecurityLevel, std::string*,
(const CdmProvisioningResponse&, SecurityLevel, std::string*,
std::string*),
(override));
MOCK_METHOD(CdmResponseType, Unprovision, (CdmSecurityLevel), (override));

2
libwvdrmengine/cdm/core/test/cdm_engine_test.cpp
View File

@@ -170,7 +170,7 @@ class WvCdmEngineTest : public WvCdmEnginePreProvTest {
CdmKeySetId key_set_id;
InitializationData init_data(init_data_type_string, key_id);
if (wvutil::g_cutoff >= wvutil::CDM_LOG_DEBUG) init_data.DumpToLogs();
if (wvutil::g_cutoff >= wvutil::LOG_DEBUG) init_data.DumpToLogs();
CdmKeyRequest key_request;

2
libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
View File

@@ -147,7 +147,7 @@ class MockCryptoSession : public TestCryptoSession {
MOCK_METHOD(CdmClientTokenType, GetPreProvisionTokenType, (), (override));
MOCK_METHOD(CdmSecurityLevel, GetSecurityLevel, (), (override));
MOCK_METHOD(CdmResponseType, Open, (), (override));
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override));
MOCK_METHOD(CdmResponseType, Open, (SecurityLevel), (override));
MOCK_METHOD(CdmResponseType, LoadCertificatePrivateKey,
(const CryptoWrappedKey&), (override));
MOCK_METHOD(bool, HasUsageInfoSupport, (bool*), (override));

8
libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp
View File

@@ -59,14 +59,14 @@ class MockCryptoSession : public TestCryptoSession {
public:
MockCryptoSession(metrics::CryptoMetrics* metrics)
: TestCryptoSession(metrics) {}
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override));
MOCK_METHOD(CdmResponseType, Open, (SecurityLevel), (override));
// Usage Table Header.
MOCK_METHOD(CdmResponseType, CreateUsageTableHeader,
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*), (override));
(SecurityLevel, CdmUsageTableHeader*), (override));
MOCK_METHOD(CdmResponseType, LoadUsageTableHeader,
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&), (override));
(SecurityLevel, const CdmUsageTableHeader&), (override));
MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader,
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*), (override));
(SecurityLevel, uint32_t, CdmUsageTableHeader*), (override));
// Usage Entry.
MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override));
MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&),

2
libwvdrmengine/cdm/core/test/device_files_unittest.cpp
View File

@@ -4474,7 +4474,7 @@ TEST_F(DeviceFilesTest, HasCertificateNone) {
EXPECT_FALSE(device_files.HasCertificate(false));
}
TEST_P(DeviceFilesSecurityLevelTest, RequestedSecurityLevel) {
TEST_P(DeviceFilesSecurityLevelTest, SecurityLevel) {
CdmSecurityLevel security_level = GetParam();
MockFileSystem file_system;
std::string certificate(kTestCertificateWithFutureExpiration);

2
libwvdrmengine/cdm/core/test/test_base.cpp
View File

@@ -598,7 +598,7 @@ void TestLicenseHolder::GenerateKeyRequest(
CdmAppParameterMap app_parameters;
CdmKeySetId key_set_id;
InitializationData init_data(init_data_type_string, key_id);
if (wvutil::g_cutoff >= wvutil::CDM_LOG_DEBUG) init_data.DumpToLogs();
if (wvutil::g_cutoff >= wvutil::LOG_DEBUG) init_data.DumpToLogs();
CdmKeyRequest key_request;
CdmResponseType result = cdm_engine_->GenerateKeyRequest(
session_id_, key_set_id, init_data, kLicenseTypeStreaming, app_parameters,

38
libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
View File

@@ -434,14 +434,14 @@ class MockCryptoSession : public TestCryptoSession {
public:
MockCryptoSession(metrics::CryptoMetrics* metrics)
: TestCryptoSession(metrics) {}
MOCK_METHOD(CdmResponseType, Open, (wvcdm::RequestedSecurityLevel), (override));
MOCK_METHOD(CdmResponseType, Open, (SecurityLevel), (override));
// Usage Table Header.
MOCK_METHOD(CdmResponseType, CreateUsageTableHeader,
(wvcdm::RequestedSecurityLevel, CdmUsageTableHeader*), (override));
(SecurityLevel, CdmUsageTableHeader*), (override));
MOCK_METHOD(CdmResponseType, LoadUsageTableHeader,
(wvcdm::RequestedSecurityLevel, const CdmUsageTableHeader&), (override));
(SecurityLevel, const CdmUsageTableHeader&), (override));
MOCK_METHOD(CdmResponseType, ShrinkUsageTableHeader,
(wvcdm::RequestedSecurityLevel, uint32_t, CdmUsageTableHeader*), (override));
(SecurityLevel, uint32_t, CdmUsageTableHeader*), (override));
// Usage Entry.
MOCK_METHOD(CdmResponseType, CreateUsageEntry, (uint32_t*), (override));
MOCK_METHOD(CdmResponseType, LoadUsageEntry, (uint32_t, const CdmUsageEntry&),
@@ -450,11 +450,11 @@ class MockCryptoSession : public TestCryptoSession {
(CdmUsageTableHeader*, CdmUsageEntry*), (override));
MOCK_METHOD(CdmResponseType, MoveUsageEntry, (uint32_t), (override));
MOCK_METHOD(CdmResponseType, GetNumberOfOpenSessions,
(wvcdm::RequestedSecurityLevel, size_t*), (override));
(SecurityLevel, size_t*), (override));
// Fake method for testing. Having an EXPECT_CALL causes complexities
// for getting table capacity during initialization.
bool GetMaximumUsageTableEntries(RequestedSecurityLevel /*security_level*/,
bool GetMaximumUsageTableEntries(SecurityLevel /*security_level*/,
size_t* number_of_entries) override {
if (number_of_entries == nullptr || !maximum_usage_table_entries_set_)
return false;
@@ -609,13 +609,13 @@ class UsageTableHeaderInitializationTest
public:
static void SetUpTestCase() { InitVectorConstants(); }
RequestedSecurityLevel GetSecurityLevel() const {
SecurityLevel GetSecurityLevel() const {
return (GetParam() == kSecurityLevelL3) ? kLevel3 : kLevelDefault;
}
};
TEST_P(UsageTableHeaderInitializationTest, RestoreUsageTable_Success) {
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
EXPECT_CALL(*crypto_session_,
GetNumberOfOpenSessions(security_level, NotNull()))
.WillRepeatedly(DoAll(SetArgPointee<1>(0), Return(NO_ERROR)));
@@ -634,7 +634,7 @@ TEST_P(UsageTableHeaderInitializationTest, RestoreUsageTable_Success) {
// to reinitialize the usage table should result in a failure.
TEST_P(UsageTableHeaderInitializationTest,
RestoreUsageTable_FailureDueToReInit) {
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// First run, success.
EXPECT_CALL(*crypto_session_,
@@ -657,7 +657,7 @@ TEST_P(UsageTableHeaderInitializationTest,
// Table MUST not be initialized before another session has been opened.
TEST_P(UsageTableHeaderInitializationTest,
RestoreUsageTable_FailureDueToExistingSessions) {
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
EXPECT_CALL(*crypto_session_,
GetNumberOfOpenSessions(security_level, NotNull()))
.WillRepeatedly(DoAll(SetArgPointee<1>(1), Return(NO_ERROR)));
@@ -667,7 +667,7 @@ TEST_P(UsageTableHeaderInitializationTest,
// No existing usage table in storage, creating a new table succeeds.
TEST_P(UsageTableHeaderInitializationTest,
RestoreUsageTable_CreateNew_AfterRetrieveFails) {
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) Fail to retrieve existing table file
@@ -698,7 +698,7 @@ TEST_P(UsageTableHeaderInitializationTest,
// skew. Creating a new table succeeds.
TEST_P(UsageTableHeaderInitializationTest,
RestoreUsageTable_CreateNew_AfterLoadFails) {
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) Existing table file is retrieved
@@ -735,7 +735,7 @@ TEST_P(UsageTableHeaderInitializationTest,
// table fails for unknown reason. Initialization MUST fail.
TEST_P(UsageTableHeaderInitializationTest,
RestoreUsageTable_CreateNew_CreateFails) {
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) No table info file exists
EXPECT_CALL(*crypto_session_,
@@ -759,7 +759,7 @@ TEST_P(UsageTableHeaderInitializationTest,
// Initialization MUST fail.
TEST_P(UsageTableHeaderInitializationTest,
RestoreUsageTable_CreateNew_StoreFails) {
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) No table info file exists
EXPECT_CALL(*crypto_session_,
@@ -786,7 +786,7 @@ TEST_P(UsageTableHeaderInitializationTest,
TEST_P(UsageTableHeaderInitializationTest, RestoreUsageTable_AtCapacity) {
std::vector<CdmUsageEntryInfo> usage_entries = kOverFullUsageEntryInfoVector;
usage_entries.resize(kDefaultTableCapacity);
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) Existing table file is retrieved
// 2) Loading existing header within OEMCrypto succeeds
@@ -813,7 +813,7 @@ TEST_P(UsageTableHeaderInitializationTest,
std::vector<CdmUsageEntryInfo> usage_entries = kOverFullUsageEntryInfoVector;
constexpr size_t kHalfMinCapacity = kDefaultTableCapacity / 2;
usage_entries.resize(kHalfMinCapacity);
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) Existing table file is retrieved
// 2) Loading existing header within OEMCrypto succeeds
@@ -842,7 +842,7 @@ TEST_P(UsageTableHeaderInitializationTest,
ASSERT_LT(kDefaultTableCapacity, kOverFullUsageEntryInfoVector.size());
const uint32_t table_start_size =
static_cast<uint32_t>(kOverFullUsageEntryInfoVector.size());
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) Existing table file is retrieved
@@ -899,7 +899,7 @@ TEST_P(UsageTableHeaderInitializationTest,
TEST_P(UsageTableHeaderInitializationTest,
RestoreUsageTable_AboveCapacity_AddEntryFails) {
ASSERT_LT(kDefaultTableCapacity, kOverFullUsageEntryInfoVector.size());
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) Existing table file is retrieved
@@ -951,7 +951,7 @@ TEST_P(UsageTableHeaderInitializationTest,
ASSERT_LT(kDefaultTableCapacity, kOverFullUsageEntryInfoVector.size());
const uint32_t table_start_size =
static_cast<uint32_t>(kOverFullUsageEntryInfoVector.size());
const RequestedSecurityLevel security_level = GetSecurityLevel();
const SecurityLevel security_level = GetSecurityLevel();
// Expectations for restore:
// 1) Existing table file is retrieved