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

Run git-clang-format am: fa49fdade0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13549770

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5e61f1c9d701212a7ad5093790dfc648ebc22aa5
This commit is contained in:
Robert Shih
2021-02-16 08:17:08 +00:00
committed by Automerger Merge Worker
parent 0a68fbf9d7 fa49fdade0
commit d754094d27
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/include/cdm_engine.h
View File

@@ -348,9 +348,8 @@ class CdmEngine {
}
virtual const std::string& GetAppPackageName() { return app_package_name_; }
virtual void SetSpoid(const std::string& spoid) { spoid_ = spoid; }
virtual CdmResponseType SetPlaybackId(
const CdmSessionId& session_id,
const std::string& playback_id);
virtual CdmResponseType SetPlaybackId(const CdmSessionId& session_id,
const std::string& playback_id);
protected:
friend class CdmEngineFactory;

8
libwvdrmengine/cdm/core/src/cdm_engine.cpp
View File

@@ -1922,10 +1922,10 @@ CdmResponseType CdmEngine::ValidateServiceCertificate(const std::string& cert) {
return certificate.Init(cert);
}
CdmResponseType CdmEngine::SetPlaybackId(
const CdmSessionId& session_id, const std::string& playback_id) {
LOGI("Setting session_id = %s playback_id = %s",
session_id.c_str(), playback_id.c_str());
CdmResponseType CdmEngine::SetPlaybackId(const CdmSessionId& session_id,
const std::string& playback_id) {
LOGI("Setting session_id = %s playback_id = %s", session_id.c_str(),
playback_id.c_str());
std::shared_ptr<CdmSession> session;
if (!session_map_.FindSession(session_id, &session)) {
LOGE("Session ID not found: %s", session_id.c_str());