diff --git a/libwvdrmengine/cdm/core/include/device_files.h b/libwvdrmengine/cdm/core/include/device_files.h index acf14b6f..d23a5d45 100644 --- a/libwvdrmengine/cdm/core/include/device_files.h +++ b/libwvdrmengine/cdm/core/include/device_files.h @@ -17,7 +17,7 @@ #include "wv_cdm_types.h" #if defined(UNIT_TEST) -#include +# include #endif namespace wvutil { diff --git a/libwvdrmengine/cdm/core/include/usage_table_header.h b/libwvdrmengine/cdm/core/include/usage_table_header.h index 33ea263e..5e9f4cea 100644 --- a/libwvdrmengine/cdm/core/include/usage_table_header.h +++ b/libwvdrmengine/cdm/core/include/usage_table_header.h @@ -19,7 +19,7 @@ #include "wv_cdm_types.h" #if defined(UNIT_TEST) -#include +# include #endif namespace wvcdm { diff --git a/libwvdrmengine/cdm/core/include/wv_cdm_types.h b/libwvdrmengine/cdm/core/include/wv_cdm_types.h index f5e3f822..1dcb769b 100644 --- a/libwvdrmengine/cdm/core/include/wv_cdm_types.h +++ b/libwvdrmengine/cdm/core/include/wv_cdm_types.h @@ -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. diff --git a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp index 3c6bb0d9..f7ce8efe 100644 --- a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp +++ b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp @@ -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) { diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp index 01c94a0b..05532bbd 100644 --- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp +++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp @@ -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; diff --git a/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp b/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp index c361022d..8b039cc2 100644 --- a/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_engine_metrics_decorator_unittest.cpp @@ -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, diff --git a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp index bb1af40b..5ec877dc 100644 --- a/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp @@ -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)); diff --git a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp index 01dc0bd2..2076d922 100644 --- a/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/certificate_provisioning_unittest.cpp @@ -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&), diff --git a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp index 7e739b8f..98464e29 100644 --- a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp @@ -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&), diff --git a/libwvdrmengine/cdm/util/src/log.cpp b/libwvdrmengine/cdm/util/src/log.cpp index b87ca043..8dedcc5c 100644 --- a/libwvdrmengine/cdm/util/src/log.cpp +++ b/libwvdrmengine/cdm/util/src/log.cpp @@ -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 +# include #else // AIDL is the default -#include +# include #endif #include #include