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

Add error codes to support ATSC license installation

Browse Source 
[ Merge of http://go/wvgerrit/163899 ]

Bug: 176871821
Test: WV Unit/integration/Luci tests
Test: libwvdrmdrmplugin_hal_test
Change-Id: I0153093433715b1357d3854043cc6362f9261c57
This commit is contained in:
Rahul Frias
2022-12-17 18:46:06 -08:00
parent 0080d04579
commit 233bac3a6f
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -451,6 +451,8 @@ enum CdmResponseEnum : int32_t {
UNSUPPORTED_SIGNATURE_HASH_ALGORITHM_2 = 391,
UNSUPPORTED_SIGNATURE_HASH_ALGORITHM_3 = 392,
UNSUPPORTED_SIGNATURE_HASH_ALGORITHM_4 = 393,
STORE_ATSC_LICENSE_DEVICE_FILES_INIT_ERROR = 394,
STORE_ATSC_LICENSE_ERROR = 395,
// Don't forget to add new values to
// * core/src/wv_cdm_types.cpp
// * android/include/mapErrors-inl.h

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

@@ -833,6 +833,10 @@ const char* CdmResponseEnumToString(CdmResponseEnum cdm_response_enum) {
return "UNSUPPORTED_SIGNATURE_HASH_ALGORITHM_3";
case UNSUPPORTED_SIGNATURE_HASH_ALGORITHM_4:
return "UNSUPPORTED_SIGNATURE_HASH_ALGORITHM_4";
case STORE_ATSC_LICENSE_DEVICE_FILES_INIT_ERROR:
return "STORE_ATSC_LICENSE_DEVICE_FILES_INIT_ERROR";
case STORE_ATSC_LICENSE_ERROR:
return "STORE_ATSC_LICENSE_ERROR";
}
return UnknownEnumValueToString(cdm_response_enum);
}

2
libwvdrmengine/include/mapErrors-inl.h
View File

@@ -447,6 +447,8 @@ static inline WvStatus mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::UNPROVISION_ERROR_3:
case wvcdm::USAGE_STORE_LICENSE_FAILED:
case wvcdm::USAGE_STORE_USAGE_INFO_FAILED:
case wvcdm::STORE_ATSC_LICENSE_DEVICE_FILES_INIT_ERROR:
case wvcdm::STORE_ATSC_LICENSE_ERROR:
err = Status::STORAGE_WRITE_FAILURE;
break;
default: