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

Merge changes Ic23e2e48,I5d25844b

Browse Source 
* changes:
  Google-style override & virtual
  Remove Sub-Licenses and Sub-Sessions
This commit is contained in:
John Bruce
2018-12-07 00:35:51 +00:00
committed by Android (Google) Code Review
parent f900486d1b b771d93514
commit dbef7f34ac
40 changed files with 116 additions and 832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/core/include/key_session.h
View File

@@ -20,7 +20,7 @@ class KeySession {
KeySession(metrics::CryptoMetrics* metrics) : metrics_(metrics) {}
public:
typedef enum { kDefault, kSubLicense, kEntitlement } KeySessionType;
typedef enum { kDefault, kEntitlement } KeySessionType;
virtual ~KeySession() {}
virtual KeySessionType Type() = 0;
virtual bool GenerateDerivedKeys(const std::string& message) = 0;
@@ -47,8 +47,6 @@ class KeySession {
metrics::CryptoMetrics* metrics_;
};
typedef std::map<std::string, CryptoSessionId> SubLicenseSessionMap;
} // namespace wvcdm
#endif // WVCDM_CORE_KEY_SESSION_H_