Squashed merge 3 CLs.
1. "Change CdmResponseType from enum into a struct" Merged from http://go/wvgerrit/163199 Bug: 253271674 2. "Log request information when server returns 401" Bug: 260760387 Bug: 186031735 Merged from http://go/wvgerrit/162798 3. "Specify server version on the command line" Bug: 251599048 Merged from http://go/wvgerrit/158897 Test: build android.hardware.drm-service.widevine Test: Netflix and Play Movies & TV Test: build_and_run_all_unit_tests.sh Bug: 253271674 Change-Id: I70c950acce070609ee0343920ec68e66b058bc23
This commit is contained in:
@@ -96,7 +96,7 @@ SharedBufferBase::~SharedBufferBase() {
|
||||
CdmResponseType res = mCDM->QuerySessionStatus(mSessionId, &status);
|
||||
|
||||
if (!::wvdrm::isCdmResponseTypeSuccess(res)) {
|
||||
ALOGE("Error querying CDM status: %u", res);
|
||||
ALOGE("Error querying CDM status: %d", static_cast<int>(res));
|
||||
*_aidl_return = false;
|
||||
return ::ndk::ScopedAStatus::ok();
|
||||
}
|
||||
@@ -305,8 +305,8 @@ Status WVCryptoPlugin::attemptDecrypt(const CdmDecryptionParametersV16& params,
|
||||
return Status::OK;
|
||||
} else {
|
||||
ALOGE("Decrypt error in session %s during a sample %s protected data: %d",
|
||||
mSessionId.c_str(), hasProtectedData ? "with" : "without", res);
|
||||
switch (res) {
|
||||
mSessionId.c_str(), hasProtectedData ? "with" : "without", static_cast<int>(res));
|
||||
switch (res.Enum()) {
|
||||
case wvcdm::INSUFFICIENT_CRYPTO_RESOURCES:
|
||||
errorDetailMsg->assign(
|
||||
"Error decrypting data: insufficient crypto resources");
|
||||
|
||||
Reference in New Issue
Block a user