widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge latest oemcrypto-v17 change

Browse Source 
No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
Kyle Zhang
2022-01-21 05:58:12 +00:00
committed by Fred Gylys-Colwell
parent c924960962
commit 642965c678
176 changed files with 301013 additions and 296749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/cdm/core/include/policy_engine.h
View File

@@ -15,12 +15,15 @@
#include "license_protocol.pb.h"
#include "wv_cdm_types.h"
namespace wvutil {
class Clock;
}
namespace wvcdm {
using video_widevine::LicenseIdentification;
using video_widevine::WidevinePsshData_EntitledKey;
class Clock;
class CryptoSession;
class PolicyTimers;
class WvCdmEventListener;
@@ -162,7 +165,7 @@ class PolicyEngine {
// Test only methods
// set_clock alters ownership of the passed-in pointer.
void set_clock(Clock* clock);
void set_clock(wvutil::Clock* clock);
void SetSecurityLevelForTest(CdmSecurityLevel security_level);
@@ -195,7 +198,7 @@ class PolicyEngine {
CryptoSession* crypto_session_;
std::unique_ptr<PolicyTimers> policy_timers_;
std::unique_ptr<Clock> clock_;
std::unique_ptr<wvutil::Clock> clock_;
CORE_DISALLOW_COPY_AND_ASSIGN(PolicyEngine);
};