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

Update usage entry before sleeping

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/139332

In the OEMCryptoUsageTableTest.VerifyUsageTimes test, move the call to
UpdateUsageEntry to before sleeping.

Bug: 183440648
Change-Id: Ie6c1d064462cd82c20b1eaa2fc1c1bb31b36d04b
This commit is contained in:
Vicky Min
2022-01-28 14:19:12 -08:00
committed by Fred Gylys-Colwell
parent e710f8f3ba
commit 20990bd141
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(),
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
<< " seconds "
"to verify usage table time since playback ended."
@@ -8854,7 +8857,6 @@ TEST_P(OEMCryptoUsageTableTest, VerifyUsageTimes) {
// |<--->| = seconds_since_last_decrypt
// |<----------------------------->| = seconds_since_first_decrypt
// |<------------------------------------| = 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.DeactivateUsageEntry());
ASSERT_NO_FATAL_FAILURE(s.UpdateUsageEntry(&encrypted_usage_header_));