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

hidl: return BAD_VALUE from RemoveOfflineLicense when keyset is not found

Browse Source 
Bug: 127828539
Test: VtsHalDrmV1_2TargetTest
Change-Id: Ia567be076a9460546c59c2a38231e18bb0549ce3
This commit is contained in:
Robert Shih
2019-03-11 18:36:04 -07:00
parent fd420ccdc5
commit d54634baa4
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libwvdrmengine/cdm/core/include/wv_cdm_types.h
View File

@@ -395,6 +395,7 @@ enum CdmResponseType {
REWRAP_DEVICE_RSA_KEY_ERROR = 344, REWRAP_DEVICE_RSA_KEY_ERROR = 344,
REWRAP_DEVICE_RSA_KEY_30_ERROR = 345, REWRAP_DEVICE_RSA_KEY_30_ERROR = 345,
INVALID_SRM_LIST = 346, INVALID_SRM_LIST = 346,
KEYSET_ID_NOT_FOUND_4 = 347,
// Don't forget to add new values to ../test/test_printers.cpp. // Don't forget to add new values to ../test/test_printers.cpp.
}; };

4
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -238,7 +238,9 @@ CdmResponseType CdmSession::RestoreOfflineSession(
"sub error: %d, key set id = %s", "sub error: %d, key set id = %s",
sub_error_code, key_set_id.c_str()); sub_error_code, key_set_id.c_str());
SetErrorDetail(error_detail, sub_error_code); SetErrorDetail(error_detail, sub_error_code);
return GET_LICENSE_ERROR; return sub_error_code == DeviceFiles::kFileNotFound
? KEYSET_ID_NOT_FOUND_4
: GET_LICENSE_ERROR;
} }
// Attempts to restore a released offline license are treated as a release // Attempts to restore a released offline license are treated as a release

3
libwvdrmengine/cdm/core/test/test_printers.cpp
View File

@@ -247,6 +247,9 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
case KEYSET_ID_NOT_FOUND_3: case KEYSET_ID_NOT_FOUND_3:
*os << "KEYSET_ID_NOT_FOUND_3"; *os << "KEYSET_ID_NOT_FOUND_3";
break; break;
case KEYSET_ID_NOT_FOUND_4:
*os << "KEYSET_ID_NOT_FOUND_4";
break;
case LICENSE_ID_NOT_FOUND: case LICENSE_ID_NOT_FOUND:
*os << "LICENSE_ID_NOT_FOUND"; *os << "LICENSE_ID_NOT_FOUND";
break; break;

3
libwvdrmengine/include_hidl/mapErrors-inl.h
View File

@@ -354,6 +354,9 @@ static Status mapCdmResponseType(wvcdm::CdmResponseType res) {
ALOGW("Returns UNKNOWN error for legacy status: %d", res); ALOGW("Returns UNKNOWN error for legacy status: %d", res);
return Status::ERROR_DRM_UNKNOWN; return Status::ERROR_DRM_UNKNOWN;
case wvcdm::KEYSET_ID_NOT_FOUND_4:
return Status::BAD_VALUE;
case wvcdm::UNKNOWN_ERROR: case wvcdm::UNKNOWN_ERROR:
return Status::ERROR_DRM_UNKNOWN; return Status::ERROR_DRM_UNKNOWN;
} }

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

@@ -1159,11 +1159,7 @@ Return<Status> WVDrmPlugin::removeOfflineLicense(const KeySetId &keySetId) {
std::string(keySetId.begin(), keySetId.end()), std::string(keySetId.begin(), keySetId.end()),
wvcdm::kSecurityLevelL3, wvcdm::kSecurityLevelL3,
identifier); identifier);
if (isCdmResponseTypeSuccess(res)) { status = mapCdmResponseType(res);
status = Status::OK;
} else {
status = Status::ERROR_DRM_INVALID_STATE;
}
} }
return status; return status;