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

Merge "Correct request_license_test failures" into sc-dev

Browse Source
This commit is contained in:
Rahul Frias
2021-04-24 01:03:49 +00:00
committed by Android (Google) Code Review
parent bee62d797e 2a316f65fe
commit 46a3f6c608
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -2994,12 +2994,14 @@ TEST_F(WvCdmRequestLicenseTest, ReleaseOfflineKeySessionUsageDisabledTest) {
// The default offline asset "offline_clip2" has the session usage table // The default offline asset "offline_clip2" has the session usage table
// entry enabled in the replay control portion of the key control block. // entry enabled in the replay control portion of the key control block.
// To have it disabled we must use "offline_clip1", so replace the last // To have it disabled we must use "offline_clip7", so replace the last
// char in init data with '1' // char in init data with '7'. PST are also automatically inserted into
// persistent licenses with renewals. This asset has a policy that prohibits
// renewals so no PST is specified.
std::string key_id; std::string key_id;
std::string client_auth; std::string client_auth;
GetOfflineConfiguration(&key_id, &client_auth); GetOfflineConfiguration(&key_id, &client_auth);
key_id[key_id.size() - 1] = '1'; key_id[key_id.size() - 1] = '7';
decryptor_->OpenSession(config_.key_system(), nullptr, kDefaultCdmIdentifier, decryptor_->OpenSession(config_.key_system(), nullptr, kDefaultCdmIdentifier,
nullptr, &session_id_); nullptr, &session_id_);
@@ -6572,7 +6574,7 @@ TEST_F(WvCdmRequestLicenseRollbackTest, Offline_RollbackBeforeRestoreKey) {
decryptor_->RestoreKey(session_id_, key_set_id); decryptor_->RestoreKey(session_id_, key_set_id);
// Verify we can't decrypt. // Verify we can't decrypt. The license start time is in the future.
EXPECT_EQ(DECRYPT_NOT_READY, Decrypt(session_id_)); EXPECT_EQ(DECRYPT_NOT_READY, Decrypt(session_id_));
RestoreSystemTime(); RestoreSystemTime();
@@ -6582,8 +6584,11 @@ TEST_F(WvCdmRequestLicenseRollbackTest, Offline_RollbackBeforeRestoreKey) {
std::this_thread::sleep_for( std::this_thread::sleep_for(
std::chrono::milliseconds(kExpirationTimeMs_ / 2)); std::chrono::milliseconds(kExpirationTimeMs_ / 2));
// Verify we can decrypt. // Verify we can't decrypt. The playback duration is short, half of the
EXPECT_EQ(NO_ERROR, Decrypt(session_id_)); // rollback time. The first playback time gets set to the rollback time
// when the license is restored. The license has expired by the time the
// clock is restored/rolled forward.
EXPECT_EQ(NEED_KEY, Decrypt(session_id_));
ASSERT_EQ(NO_ERROR, decryptor_->CloseSession(session_id_)); ASSERT_EQ(NO_ERROR, decryptor_->CloseSession(session_id_));
} }