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

Merge "Fix getSecureStop returns zero opaque data intermittently."

Browse Source
This commit is contained in:
Edwin Wong
2019-01-07 22:39:19 +00:00
committed by Android (Google) Code Review
parent 9e82eccc2e f7659c72dd
commit e2cf30bec7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/mediadrm/src_hidl/WVDrmPlugin.cpp
View File

@@ -672,7 +672,9 @@ Return<void> WVDrmPlugin::getSecureStop(
_hidl_cb(Status::BAD_VALUE, SecureStop()); _hidl_cb(Status::BAD_VALUE, SecureStop());
return Void(); return Void();
} }
const std::vector<uint8_t> id = toVector(secureStopId); const std::vector<uint8_t> id = toVector(secureStopId);
std::vector<uint8_t> cdmStopVec;
SecureStop secureStop; SecureStop secureStop;
CdmIdentifier identifier; CdmIdentifier identifier;
@@ -688,7 +690,6 @@ Return<void> WVDrmPlugin::getSecureStop(
mPropertySet.app_id(), cdmSsId, identifier, &cdmUsageInfo); mPropertySet.app_id(), cdmSsId, identifier, &cdmUsageInfo);
if (isCdmResponseTypeSuccess(res)) { if (isCdmResponseTypeSuccess(res)) {
std::vector<uint8_t> cdmStopVec;
for (CdmUsageInfo::const_iterator iter = cdmUsageInfo.begin(); for (CdmUsageInfo::const_iterator iter = cdmUsageInfo.begin();
iter != cdmUsageInfo.end(); iter != cdmUsageInfo.end();
++iter) { ++iter) {