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

Merge "Update usage entry before sleeping" into sc-widevine-release

Browse Source
This commit is contained in:
TreeHugger Robot
2022-03-24 00:32:25 +00:00
committed by Android (Google) Code Review
parent 1cd85a6b79 20990bd141
commit 3ac8cddc34
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -8842,6 +8842,9 @@ TEST_P(OEMCryptoUsageTableTest, VerifyUsageTimes) {
s.pst_report().seconds_since_last_decrypt(), s.pst_report().seconds_since_last_decrypt(),
playback_time, kUsageTableTimeTolerance); playback_time, kUsageTableTimeTolerance);
// We must update the usage entry BEFORE sleeping, not after.
ASSERT_NO_FATAL_FAILURE(s.UpdateUsageEntry(&encrypted_usage_header_));
cout << "Wait another " << kIdleInSeconds cout << "Wait another " << kIdleInSeconds
<< " seconds " << " seconds "
"to verify usage table time since playback ended." "to verify usage table time since playback ended."
@@ -8854,7 +8857,6 @@ TEST_P(OEMCryptoUsageTableTest, VerifyUsageTimes) {
// |<--->| = seconds_since_last_decrypt // |<--->| = seconds_since_last_decrypt
// |<----------------------------->| = seconds_since_first_decrypt // |<----------------------------->| = seconds_since_first_decrypt
// |<------------------------------------| = seconds_since_license_received // |<------------------------------------| = seconds_since_license_received
ASSERT_NO_FATAL_FAILURE(s.UpdateUsageEntry(&encrypted_usage_header_));
ASSERT_NO_FATAL_FAILURE(entry.GenerateVerifyReport(kActive)); ASSERT_NO_FATAL_FAILURE(entry.GenerateVerifyReport(kActive));
ASSERT_NO_FATAL_FAILURE(entry.DeactivateUsageEntry()); ASSERT_NO_FATAL_FAILURE(entry.DeactivateUsageEntry());
ASSERT_NO_FATAL_FAILURE(s.UpdateUsageEntry(&encrypted_usage_header_)); ASSERT_NO_FATAL_FAILURE(s.UpdateUsageEntry(&encrypted_usage_header_));