Ran google3 clang-format on cdm source.

Merge from http://go/wvgerrit/144969

Test: build
  m android.hardware.drm-service.widevine -j128

Test: atest VtsAidlHalDrmTargetTest

Bug: 216720425
Change-Id: Ie1872d2a48e3b3645853e9831816afecffac747f
This commit is contained in:
Edwin
2022-02-03 20:26:21 -08:00
parent f4d6ef3858
commit 6112060529
10 changed files with 41 additions and 27 deletions

View File

@@ -17,7 +17,7 @@
#include "wv_cdm_types.h"
#if defined(UNIT_TEST)
#include <gtest/gtest_prod.h>
# include <gtest/gtest_prod.h>
#endif
namespace wvutil {

View File

@@ -19,7 +19,7 @@
#include "wv_cdm_types.h"
#if defined(UNIT_TEST)
#include <gtest/gtest_prod.h>
# include <gtest/gtest_prod.h>
#endif
namespace wvcdm {

View File

@@ -833,7 +833,8 @@ const char* CdmOfflineLicenseStateToString(
CdmOfflineLicenseState license_state);
const char* CdmSecurityLevelToString(CdmSecurityLevel security_level);
const char* CdmUsageEntryStorageTypeToString(CdmUsageEntryStorageType type);
const char* RequestedSecurityLevelToString(RequestedSecurityLevel security_level);
const char* RequestedSecurityLevelToString(
RequestedSecurityLevel security_level);
// Converts a generic, unknown enum value to a string representation
// containing its numeric value.
// The pointer returned from this function is thread_local.

View File

@@ -173,7 +173,8 @@ CertificateProvisioning::GetProvisioningType() {
* Returns NO_ERROR for success and CERT_PROVISIONING_REQUEST_ERROR_? if fails.
*/
CdmResponseType CertificateProvisioning::GetProvisioningRequest(
wvutil::FileSystem* file_system, RequestedSecurityLevel requested_security_level,
wvutil::FileSystem* file_system,
RequestedSecurityLevel requested_security_level,
CdmCertificateType cert_type, const std::string& cert_authority,
const std::string& origin, const std::string& spoid,
CdmProvisioningRequest* request, std::string* default_url) {
@@ -183,7 +184,8 @@ CdmResponseType CertificateProvisioning::GetProvisioningRequest(
}
CdmResponseType CertificateProvisioning::GetProvisioningRequestInternal(
wvutil::FileSystem* file_system, RequestedSecurityLevel requested_security_level,
wvutil::FileSystem* file_system,
RequestedSecurityLevel requested_security_level,
CdmCertificateType cert_type, const std::string& cert_authority,
const std::string& origin, const std::string& spoid,
CdmProvisioningRequest* request, std::string* default_url) {

View File

@@ -1670,7 +1670,8 @@ uint8_t OEMCrypto_Security_Patch_Level(wvcdm::RequestedSecurityLevel level) {
return fcn->SecurityPatchLevel();
}
OEMCrypto_Security_Level OEMCrypto_SecurityLevel(wvcdm::RequestedSecurityLevel level) {
OEMCrypto_Security_Level OEMCrypto_SecurityLevel(
wvcdm::RequestedSecurityLevel level) {
if (!gAdapter) return OEMCrypto_Level_Unknown;
const FunctionPointers* fcn = gAdapter->GetFunctionPointers(level);
if (!fcn) return OEMCrypto_Level_Unknown;
@@ -1726,8 +1727,8 @@ uint32_t OEMCrypto_GetAnalogOutputFlags(wvcdm::RequestedSecurityLevel level) {
return fcn->GetAnalogOutputFlags();
}
OEMCryptoResult OEMCrypto_BuildInformation(char* buffer, size_t* buffer_length,
wvcdm::RequestedSecurityLevel level) {
OEMCryptoResult OEMCrypto_BuildInformation(
char* buffer, size_t* buffer_length, wvcdm::RequestedSecurityLevel level) {
if (!gAdapter) return OEMCrypto_ERROR_UNKNOWN_FAILURE;
const FunctionPointers* fcn = gAdapter->GetFunctionPointers(level);
if (!fcn) return OEMCrypto_ERROR_INVALID_SESSION;

View File

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

View File

@@ -147,7 +147,8 @@ 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, (wvcdm::RequestedSecurityLevel),
(override));
MOCK_METHOD(CdmResponseType, LoadCertificatePrivateKey,
(const CryptoWrappedKey&), (override));
MOCK_METHOD(bool, HasUsageInfoSupport, (bool*), (override));

View File

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

View File

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

View File

@@ -11,11 +11,11 @@
* at the top of your source file) to change that behavior.
*/
#ifndef LOG_NDEBUG
#ifdef NDEBUG
#define LOG_NDEBUG 1
#else
#define LOG_NDEBUG 0
#endif
# ifdef NDEBUG
# define LOG_NDEBUG 1
# else
# define LOG_NDEBUG 0
# endif
#endif
#define LOG_TAG "WVCdm"
@@ -24,9 +24,9 @@
#include "log.h"
#ifdef IS_HIDL
#include <hwbinder/IPCThreadState.h>
# include <hwbinder/IPCThreadState.h>
#else // AIDL is the default
#include <binder/IPCThreadState.h>
# include <binder/IPCThreadState.h>
#endif
#include <stdarg.h>
#include <stdio.h>