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

Snap for 8146528 from f1bfd6f202 to tm-release

Browse Source 
Change-Id: I32c3bf849b01493b6f2ec0d2cbac2f1eaedc8588
This commit is contained in:
Android Build Coastguard Worker
2022-02-04 02:20:01 +00:00
parent 9cf6c441bf f1bfd6f202
commit c4cd4a60ed
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp
View File

@@ -279,7 +279,8 @@ SecurityLevel WVDrmPlugin::mapSecurityLevel(const std::string& level) {
}
if (wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3 == native_security_level &&
in_securityLevel >= SecurityLevel::SW_SECURE_DECODE) {
in_securityLevel >= SecurityLevel::SW_SECURE_DECODE &&
in_securityLevel != SecurityLevel::DEFAULT) {
*_aidl_return = sessionId;
return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
}
@@ -1704,7 +1705,7 @@ void WVDrmPlugin::sendEvent(
void WVDrmPlugin::sendExpirationUpdate(const vector<uint8_t>& in_sessionId,
int64_t in_expiryTimeInMS) {
::ndk::ScopedAStatus err;
::ndk::ScopedAStatus err = ::ndk::ScopedAStatus::ok();
if (mListener != nullptr) {
err = mListener->onExpirationUpdate(in_sessionId, in_expiryTimeInMS);
} else {
@@ -1720,7 +1721,7 @@ void WVDrmPlugin::sendKeysChange(
const vector<uint8_t>& in_sessionId,
const vector<::aidl::android::hardware::drm::KeyStatus>& in_keyStatusList,
bool in_hasNewUsableKey) {
::ndk::ScopedAStatus err;
::ndk::ScopedAStatus err = ::ndk::ScopedAStatus::ok();
if (mListener != nullptr) {
err = mListener->onKeysChange(in_sessionId, in_keyStatusList,
in_hasNewUsableKey);
@@ -1734,7 +1735,7 @@ void WVDrmPlugin::sendKeysChange(
}
void WVDrmPlugin::sendSessionLostState(const vector<uint8_t>& in_sessionId) {
::ndk::ScopedAStatus err;
::ndk::ScopedAStatus err = ::ndk::ScopedAStatus::ok();
if (mListener != nullptr) {
err = mListener->onSessionLostState(in_sessionId);
} else {