Allow offline licenses to be loaded and restored in the same session
[ Merge of http://go/wvgerrit/103243 ] In v16, OEMCrypto specifications required that an error be returned if multiple attempts are made to load an offline license into a session. This caused the GTS test testConcurrentDrmCertificates to fail. It was introduced to verify that a license could retrieved and loaded into a session and then restored. This was based on an app use case. Ideally we would like to disallow a this behavior but need to make sure it is not being used by apps. For now this will be allowed. If detected, the CDM will reintialize the OEMCrypto session and allow the license to be restored. Bug: 161551490 Test: WV unit integration tests, GtsMediaTestCases and WidevineConcurrentDrmCertificatesTest#testConcurrentDrmCertificates, MediaDrmTest#testMultipleLoadKeys on a redfin Change-Id: I0834e4419c3a6dccfd77aaea3afa3d65c2c0c742
This commit is contained in:
@@ -478,6 +478,8 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
|
||||
return kRenewKeyError2;
|
||||
case wvcdm::RESTORE_OFFLINE_LICENSE_ERROR_2:
|
||||
return kRestoreOfflineLicenseError2;
|
||||
case wvcdm::RESTORE_OFFLINE_LICENSE_ERROR_3:
|
||||
return kRestoreOfflineLicenseError3;
|
||||
case wvcdm::SAMPLE_AND_SUBSAMPLE_SIZE_MISMATCH:
|
||||
return kSampleAndSubsampleSizeMismatch;
|
||||
case wvcdm::SESSION_FILE_HANDLE_INIT_ERROR:
|
||||
|
||||
Reference in New Issue
Block a user