widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,219 Commits 2 Branches 0 Tags
ad8edfb449e1f5a9bc1ca57682a50aa0d930b0b6
Commit Graph

5219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Gylys-Colwell
ad8edfb449 Add fudge to duration tests am: 20833734e1 am: fd451af75b am: 05ae982332 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I3f8b63f93cd015ab30d75619b6a6c14821366310
 2021-05-25 23:00:11 +00:00
Fred Gylys-Colwell
05ae982332 Add fudge to duration tests am: 20833734e1 am: fd451af75b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I8966f72720a092701e0e15aeb19a75d7fcd82b68
 2021-05-25 22:38:14 +00:00
Fred Gylys-Colwell
fd451af75b Add fudge to duration tests am: 20833734e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I16f3d23c16e35dd01b6ff669b911f741b1397c68
 2021-05-25 22:23:58 +00:00
Fred Gylys-Colwell
05981c10b3 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: 042a715e93 am: 4ebcbda709 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: Ic373e2f22a5e9e6d50a495fbf66f531e621b3831
 2021-05-25 21:09:28 +00:00
Fred Gylys-Colwell
4964c79d93 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: c6cfc6a296 am: 9a13a70164 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I11964ae28e3da961a07c77a88e9a9c0f0bce695b
 2021-05-25 21:09:17 +00:00
Fred Gylys-Colwell
4ebcbda709 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: 042a715e93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I7e004644cdc2e8f9f63675d11f48a2501eb12761
 2021-05-25 20:55:41 +00:00
Fred Gylys-Colwell
9a13a70164 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 am: c6cfc6a296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I0c7fa50afb40a5d2f4337dd9a1c229709556f3ad
 2021-05-25 20:53:54 +00:00
Fred Gylys-Colwell
c6cfc6a296 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: I9f470bb6e857fe9718a7989a33ba597401bbc8ec
 2021-05-25 20:38:06 +00:00
Fred Gylys-Colwell
042a715e93 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev am: eaa1e6d4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14486069

Change-Id: Ie54dd7ffc4f354cb368fb23fbeb672feb67ad0f1
 2021-05-25 20:36:19 +00:00
Fred Gylys-Colwell
20833734e1 Add fudge to duration tests 
Merge from Widevine repo of http://go/wvgerrit/125046

Add some extra fudge to the termination time. This assumes that flaky
tests were caused by roundoff error.

Bug: 175741647
Change-Id: I9bcc86f9b9540e5985df647dd1b5c5d439556e2b
 2021-05-25 20:26:43 +00:00
Fred Gylys-Colwell
eaa1e6d4a0 Merge "LUCI: Add build fuzz tests script to presubmits" into sc-dev 2021-05-25 20:19:49 +00:00
Alex Dale
5cdd040dfe Check for open session when initializing usage table. am: 023b06eded am: e0f31dc2b5 am: e583f2213a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: Id761f670084fab41c97103736428212c1876693d
 2021-05-24 22:01:28 +00:00
Alex Dale
6805c0e267 Check for open session when initializing usage table. am: 023b06eded am: 51ec04bd43 am: f423cc7a4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: Ice3bdbb35d67403ae5af9bc005f798ec0a2de567
 2021-05-24 22:01:22 +00:00
Alex Dale
e583f2213a Check for open session when initializing usage table. am: 023b06eded am: e0f31dc2b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I535702147bfadcc31e1ad5ca0e9e82cbe26fa5e6
 2021-05-24 21:47:47 +00:00
Alex Dale
f423cc7a4e Check for open session when initializing usage table. am: 023b06eded am: 51ec04bd43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I32551ce5190f240b1f2a0fe8a86688dbcd11c90e
 2021-05-24 21:46:38 +00:00
Alex Dale
51ec04bd43 Check for open session when initializing usage table. am: 023b06eded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: Id8abc3e56f0495edad72fffa20579887e1ae2045
 2021-05-24 21:32:39 +00:00
Alex Dale
e0f31dc2b5 Check for open session when initializing usage table. am: 023b06eded 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14296026

Change-Id: I4b0b46d585f99c492e30e608a0a18708fc40b042
 2021-05-24 21:30:44 +00:00
Alex Dale
023b06eded Check for open session when initializing usage table. 
[ Merge of http://go/wvgerrit/122984 ]

There was an issue encountered by some vendors with how the usage
table was initialized on some devices.  Previously, the CDM would
open an OEMCrypto session first, then initialize the usage table
(loading existing or creating a new one).  On these devices,
OEMCrypto_CreateUsageTableHeader() and OEMCrypto_LoadUsageTableHeader()
would fail if there were any open sessions.

This CL changes the initialization process to create/load the usage
table before opening an OEMCrypto session.

This change also lays the ground work for another usage table fix
to address GTS tests failure.

In the process, several of the functions for the usage table have been
split up into smaller chunks of code.  This required additional changes
to the usage table unittest to keep them up to date.

Bug: 169195093
Bug: 180639135
Test: Linux unittests and MediaDrmTest
Change-Id: Ifbf35f5d8cff5b89fea9b16edb998c84803f4fbe
 2021-05-19 10:39:51 -07:00
TreeHugger Robot
0d73618aae Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: ea6f596e96 am: 86bbd25775 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ia1640bd4c51f1e2203d5b7f848925eafcc7d1666
 2021-05-17 22:41:22 +00:00
TreeHugger Robot
4f9d0720e2 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: 69d18ebcf9 am: 36198f6066 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: If1c4204b0239f7e0cea92137598951251a8a00b2
 2021-05-17 22:40:40 +00:00
TreeHugger Robot
6e78d618d9 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 am: d49e3362ea -s ours am: e2ed4f0585 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I45634a56c6e7f4ebd16fd39da04a1a0fe70a5c0a
 2021-05-17 22:39:49 +00:00
Alex Dale
c7456bab72 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" am: fe28d4cafc am: ce38cd3a5e -s ours am: bfd230c1d7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I798c9fa248de50dee3f718657a0d614676a8d339
 2021-05-17 22:39:48 +00:00
TreeHugger Robot
0b3c3b65a1 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: e0344b8efb am: 7ebf3c7c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ie1a6465e32cbc0f646446f7f803297b32a6406f9
 2021-05-17 22:33:54 +00:00
TreeHugger Robot
bd91a3f031 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: ac87531b36 am: 698a6b0151 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: I8c6c39037f45d9a4985114bdf0a04ea20de1ee46
 2021-05-17 22:33:06 +00:00
TreeHugger Robot
2accc51959 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 -s ours am: 961e1a7eb9 am: 84ed07a1e9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I0d7992a9dac71353348ef28c37c450bc1f6c73b9
 2021-05-17 22:32:17 +00:00
TreeHugger Robot
86bbd25775 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: ea6f596e96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: I86b6e91b07ed51805bd18d81bb30f475f3a80f36
 2021-05-17 22:31:10 +00:00
TreeHugger Robot
36198f6066 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: 69d18ebcf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: Id2cce2db5f894e1ae6d01830a78210d3ead25c99
 2021-05-17 22:31:08 +00:00
TreeHugger Robot
e2ed4f0585 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 am: d49e3362ea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I5f4b0554771c93d2afb71866cc2b865a2f987357
 2021-05-17 22:31:01 +00:00
Alex Dale
bfd230c1d7 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)" am: fe28d4cafc am: ce38cd3a5e -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: Ibfc459967aa5cb6c735dc6b918a37e583e741416
 2021-05-17 22:31:00 +00:00
TreeHugger Robot
d6a1277950 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b am: 14b30786d9 -s ours am: 42431589c9 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I49b7b37b4c47cd78df4d9359482ab04c18c3a43f
 2021-05-17 22:30:55 +00:00
Cong Lin
1f94819718 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev am: 22f8ee9498 am: 3aee415125 -s ours am: 4d446f8a73 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I183d6079446a096dbe9a5baae5d95f11a3c992b0
 2021-05-17 22:30:54 +00:00
Rahul Frias
9131483144 Merge "Disallow the ability to load offline licenses more than once" into sc-dev am: bb0b6b4ba5 am: 361dbbe269 am: 9482d07f10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14307365

Change-Id: If86877b7deb8f73b98aec75c9a02b06bec1eaac7
 2021-05-17 22:29:50 +00:00
TreeHugger Robot
7ebf3c7c0e Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 am: e0344b8efb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ic93cc95351f2e8d09c247075928578c0212ca999
 2021-05-17 22:29:29 +00:00
TreeHugger Robot
698a6b0151 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 am: ac87531b36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: I81682f41b5405a51f1d1c7a19c7a2a5ad6c3e8ab
 2021-05-17 22:29:27 +00:00
TreeHugger Robot
84ed07a1e9 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 -s ours am: 961e1a7eb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I1ac84784702a8a04ab0a031299fea779524a32dc
 2021-05-17 22:29:15 +00:00
Cong Lin
c34fa3d08e [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 8b84dd36a1 am: 5ed13c2c28 -s ours am: 1e032deed0 am: 8eceff3037 -s ours am: 146cb923fe -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: I397e0ff24b57670acbcb0833e65cc35e2f6c0c5d
 2021-05-17 22:22:05 +00:00
Cong Lin
d828f20dfd [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 -s ours am: 1fb5b4d68c am: 6514bde77e -s ours am: 1a3c6d7228 am: b13379127c -s ours am: 3627e852cb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I5a36d5ecac1f5bfc73cebf8acb7cc11120c9aa13
 2021-05-17 22:21:03 +00:00
Cong Lin
b1b095497d [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix qt-dev am: eb9a027f0a am: b6b2367e9d -s ours am: 9fbcb7f1ba am: 5d1b215cb7 -s ours am: 23558d65b4 am: 647ca0e3a0 -s ours am: d11e560f7f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238888

Change-Id: Icaf2174e54be2119bdc66b9a8c36e256f516ca72
 2021-05-17 22:19:54 +00:00
Cong Lin
bba0320725 [automerger skipped] [RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix am: 5ea6b86f79 am: bc7c7a971d -s ours am: cff7fd681e am: b777a01117 -s ours am: cded22bf8d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14283069

Change-Id: I5bc638db498d28200afc26cedfc7e1c95123bbaf
 2021-05-17 22:18:26 +00:00
TreeHugger Robot
ea6f596e96 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Iae742c9f96d689c05970c8630555f03b976d351b
 2021-05-17 22:13:41 +00:00
TreeHugger Robot
69d18ebcf9 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: If04536a13255810ddcb9416ce17daec641fa7fcd
 2021-05-17 22:13:37 +00:00
TreeHugger Robot
cb3bea320e Merge "Report Rental duration remaining" into sc-dev am: 4057559ae5 am: 2695afcc94 am: c57b135a6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14383050

Change-Id: I9fabc2d65392fa51852fe98f314c1d6c3507ef72
 2021-05-17 22:12:43 +00:00
TreeHugger Robot
4179857f4a Merge "Use Usage information from OEMCrypto on clock rollback" into sc-dev am: b7662fcbf2 am: 15662cb9c1 am: 615727603d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14294932

Change-Id: I1a8967b2f5fc381061540ed20f73df8c8e6f233d
 2021-05-17 22:11:33 +00:00
TreeHugger Robot
e0344b8efb Merge "Validate decryption with entitled keys in OEC tests" into sc-dev am: e233e68de1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506727

Change-Id: Ifd10be34ef0ac4ca02c5f5781db013436c1c6c85
 2021-05-17 22:10:23 +00:00
TreeHugger Robot
ac87531b36 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev am: 418d322961 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14506726

Change-Id: Ia4c41e3fe92fe8a5514e3253db930ec95b3eaec6
 2021-05-17 22:10:18 +00:00
Alex Dale
651a65abbd Clean up other core CDM logs. am: 0579fe805e am: c3f1395994 am: 8e8d37245d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14238896

Change-Id: I5a37e2ebf8d7d263e214c5e06a2bb80118524db4
 2021-05-17 22:10:04 +00:00
TreeHugger Robot
961e1a7eb9 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (3/3 OEM Cert)"" into sc-dev am: 4948331656 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14472446

Change-Id: I2127568fa68bbb5d4e7ed6abad2b22f82c8df409
 2021-05-17 22:10:01 +00:00
TreeHugger Robot
e233e68de1 Merge "Validate decryption with entitled keys in OEC tests" into sc-dev 2021-05-17 22:09:52 +00:00
TreeHugger Robot
418d322961 Merge "Remove asserts from GenerateSimpleSampleDescription()" into sc-dev 2021-05-17 22:09:21 +00:00
TreeHugger Robot
ec45774392 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Refresh L3 libraries after buffer overflow fix sc-dev" into sc-dev am: ddaae9a17b am: 099c1ffdc9 am: 18026660ad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14235494

Change-Id: I32c7e3cc1cf881b1211e702851c63f32873e83ac
 2021-05-17 22:08:25 +00:00