Rahul Frias
171096b9bb
Merge "Address unit test failures" into sc-dev am: 5271d95ce4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14940264
Change-Id: I4c45f2eedaed5f8f2bdca5efad36392faf58028e
2021-06-30 19:41:26 +00:00
Rahul Frias
5271d95ce4
Merge "Address unit test failures" into sc-dev
2021-06-30 19:30:22 +00:00
Cong Lin
c16317b811
Fix L3 clock loading issue am: 61218ec6cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14930112
Change-Id: I3e58e10f94719dccf617fb866bb15baba61ee868
2021-06-24 18:47:31 +00:00
Cong Lin
61218ec6cf
Fix L3 clock loading issue
...
This is a merge of http://go/wvgerrit/126703
Only obfuscated libraries for Android are included in this CL.
L3 loads clock info from an encrypted file during initialization. There
is a bug which calls the clock loading function before the decryption
key gets intialized in InitializeEngine(). Clock will be loaded with bad
decrypted data, which caused playback failure after system reboot.
The fix is to move clock loading after InitializeEngine() to ensure
decryption key is ready.
Bug: 188873354
Bug: 188892717
Test: L3 unit tests;
Test: Manual playback tests on Netflix
Download, play, reboot device, play again
Test: GTS tests https://android-build.googleplex.com/builds/tests/view?invocationId=I02800009363823424&testResultId=TR23225132004211909&redirect=http://sponge2/73efa8e8-951a-48bb-b2a9-0b09d5038ed3
Change-Id: Icf34aa3135fdcb77dea8104a90ce90f14e79e61c
2021-06-21 22:15:18 +00:00
Rahul Frias
90fd9b76ef
Update VersionNumberTest.VersionNumberChangeCanary am: 52d3c9f7c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14899053
Change-Id: I540b4236b13ab9d5e6e2ef718d80f9daf2dfaf08
2021-06-15 18:06:41 +00:00
Rahul Frias
52d3c9f7c1
Update VersionNumberTest.VersionNumberChangeCanary
...
[ Merge of http://go/wvgerrit/126463 ]
The Version Number in the test is being updated to 12 to reflect
android OS version (Test only change)
Bug: 190467766
Test: WV request_license_test:
requestVersionNumberTest.VersionNumberChangeCanary
Change-Id: Iad4bb3f178fb2dcb454027c1323e51fe34dfdfff
2021-06-15 03:01:55 -07:00
Rahul Frias
8e92fef410
Address unit test failures
...
[ Merge of http://go/wvgerrit/126744 ]
* EngineMetrics previous_oemcrypto_initialization_failure is set only
on a previous failure. Removing it from the list of expectations
as we cannot be certain that it will or will not be set unless we
know the previous state of the device.
* Corrected client_capabililties expectations in
CdmLicenseTest.PrepareKeyRequestValidation
* Correct error expected in
- WVDrmPluginTest.RejectsAtscProvisioningRequests
- WVDrmPluginTest.RejectsAtscUnprovisionDeviceRequests
* Correct expectations
- CdmSessionTest.InitWithBuiltInCertificate,
- CdmSessionTest.InitWithCertificate
- CdmSessionTest.ReInitFail,
- CdmSessionTest.InitFailCryptoError
Bug: 181693982
Test: WV unit/integration tests
Change-Id: I2f1e1c38604d768e0532b30d8551c77ea45e63f4
2021-06-14 08:04:40 +00:00
TreeHugger Robot
41cd961433
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours am: 49462e3f0d am: 21b722330a -s ours am: eced697d90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: Id08e292d99b29e2cc6cd29973596e54b3ed1ef09
2021-06-10 00:05:57 +00:00
Cong Lin
f610272232
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours am: 6c16096c18 am: f11c581b5b -s ours am: 2ed99512eb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: Ie636338bd82e89708b547816c591c44b00f024d3
2021-06-10 00:05:56 +00:00
TreeHugger Robot
9d502c128b
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours am: 49462e3f0d am: 816a7cd53b -s ours am: 6665272f76
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I2ecb293afd5ce18d163bb02e39428a0ca4435ea3
2021-06-10 00:05:29 +00:00
Cong Lin
5315028949
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours am: 6c16096c18 am: 708c24e406 -s ours am: a01dd26e32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I2eceedc6bb8e0465d9cf254b605ac8dfe79beb11
2021-06-10 00:05:28 +00:00
TreeHugger Robot
eced697d90
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours am: 49462e3f0d am: 21b722330a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: Ieb11acff89bb02d7f0ab3fbb41ce2b1349311c33
2021-06-09 23:46:10 +00:00
Cong Lin
2ed99512eb
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours am: 6c16096c18 am: f11c581b5b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I1b8e78cac099447cdce0371ce1baf3cacea823f3
2021-06-09 23:46:09 +00:00
TreeHugger Robot
6665272f76
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours am: 49462e3f0d am: 816a7cd53b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I9c27ee37767cd0a7cb994878e6a6f93e8a49ebc0
2021-06-09 23:45:45 +00:00
Cong Lin
a01dd26e32
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours am: 6c16096c18 am: 708c24e406 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I7e3d4c0cd74cbc13a80f5e4c1daa1ba665bf43d5
2021-06-09 23:45:43 +00:00
TreeHugger Robot
21b722330a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours am: 49462e3f0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I3e0484621df15a693a4bf868f1c229e5e04b9615
2021-06-09 23:27:08 +00:00
Cong Lin
f11c581b5b
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours am: 6c16096c18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I445c5a1535c4ef78205093e396362dc587b5c754
2021-06-09 23:27:07 +00:00
TreeHugger Robot
816a7cd53b
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours am: 49462e3f0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: Ibf6230dfed09760bbd16f56526cb2055f7a6055e
2021-06-09 23:26:39 +00:00
Cong Lin
708c24e406
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours am: 6c16096c18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: Ia0335af4bf828a273579b1a7bc5a10eab78ef07c
2021-06-09 23:26:38 +00:00
TreeHugger Robot
49462e3f0d
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e am: 1ea8bee2a1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I78845333f380e606b7a05e34835b32b34df63df2
2021-06-09 23:15:16 +00:00
Cong Lin
6c16096c18
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463 am: ae49fad32b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I1d4f60902b573d8f7ba76fc24406fc34db71a7d0
2021-06-09 23:14:27 +00:00
TreeHugger Robot
1ea8bee2a1
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev am: 35b1be117e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I6383c0dc15866b3ccad0b7b8a097fb4208f7d25d
2021-06-09 23:02:47 +00:00
Cong Lin
ae49fad32b
[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: f10acda463
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629081
Change-Id: I4bcbdfd8fe317277901c52f3e8fbd1a420b2f2b8
2021-06-09 23:02:46 +00:00
TreeHugger Robot
35b1be117e
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into qt-dev
2021-06-09 22:40:20 +00:00
TreeHugger Robot
55e5d66e44
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev am: d8851ceda3 am: 0fa815a51e -s ours am: e9695a79ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: Ib345ef653cb4e2721b05210010d9c6b7d0538b1a
2021-06-09 22:11:15 +00:00
Cong Lin
905ad69a6e
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140 -s ours am: 7dd96a13a7 -s ours am: ede4ffed7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: Ibf39cb359f1b1211984fcb91cdd63457310596bf
2021-06-09 22:11:15 +00:00
TreeHugger Robot
f4a15baa16
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev am: d8851ceda3 am: c276a94eac -s ours am: f8645d9966
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: I63315332a752b3b4b9e889f848ababc573717800
2021-06-09 22:11:09 +00:00
Cong Lin
fcf3af7599
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140 am: 23fa208349 -s ours am: 216e8317d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: I7d8c9163bece8b8ba6ded32abf47c3890a2650df
2021-06-09 22:11:08 +00:00
TreeHugger Robot
e9695a79ef
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev am: d8851ceda3 am: 0fa815a51e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: I6bae43f503cdae9d92ced1cd77e0cc5d821ac93a
2021-06-09 22:07:11 +00:00
Cong Lin
ede4ffed7f
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140 -s ours am: 7dd96a13a7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: If76f0263de86d368584584c9fb358ac622ce25cd
2021-06-09 22:05:26 +00:00
TreeHugger Robot
f8645d9966
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev am: d8851ceda3 am: c276a94eac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: Icbd063a89907a4f55efd57044675fef62ddbb7b1
2021-06-09 21:54:29 +00:00
Cong Lin
216e8317d4
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140 am: 23fa208349 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: Ie87e47438089ddcfb6883ee54db97b17c878e5a0
2021-06-09 21:53:49 +00:00
TreeHugger Robot
0fa815a51e
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev am: d8851ceda3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: Idb1c7af62e6eb1bfefe1ced67d96f2ff8830d3d3
2021-06-09 21:53:47 +00:00
Cong Lin
7dd96a13a7
[automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140 -s ours
...
am skip reason: skipped by user conglin
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: I5b8d1c9e69b06cf15cba25c11cbc066a9aa8b382
2021-06-09 21:53:40 +00:00
TreeHugger Robot
15be9f4b29
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into sc-dev am: 1f1f35f56a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14645772
Change-Id: I1ff98afb23db8d62c5df5a34a543cfccd53be987
2021-06-09 21:41:10 +00:00
Cong Lin
7a5f8fc820
[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: 563a79bd8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14645772
Change-Id: Ida5e3b3ed2b18b700cc0e3ea4b445c4f467276cf
2021-06-09 21:41:09 +00:00
TreeHugger Robot
e12c1111ec
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-qpr-dev am: c3ba913a07 -s ours am: 8dcf2887f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14628748
Change-Id: Ib20b19da72e1c0daaf1d35acfa13f4045ca98464
2021-06-09 21:41:05 +00:00
TreeHugger Robot
c276a94eac
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev am: d8851ceda3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: I32986d4d5aeef67ef43e99f34250c8b2bee16d63
2021-06-09 21:36:50 +00:00
Cong Lin
23fa208349
[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14629074
Change-Id: Id73aea48ba5962021cbf6d200a55936b0ce824f7
2021-06-09 21:36:48 +00:00
TreeHugger Robot
1f1f35f56a
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into sc-dev
2021-06-09 21:33:04 +00:00
TreeHugger Robot
8dcf2887f1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-qpr-dev am: c3ba913a07 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14628748
Change-Id: Ibb8f8d2daa1f37e3cd2c631176441b9c7469942e
2021-06-09 21:23:06 +00:00
TreeHugger Robot
d8851ceda3
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-dev
2021-06-09 21:19:20 +00:00
TreeHugger Robot
c3ba913a07
Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into rvc-qpr-dev
2021-06-09 21:09:40 +00:00
TreeHugger Robot
ad70624aae
Merge "Use drm@1.4 vintf fragments for drm@1.3" into sc-dev am: b791286119
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14842900
Change-Id: I08bc0d98433e545dac696fcdb8716f1e7cbbfc0c
2021-06-09 00:57:39 +00:00
TreeHugger Robot
b791286119
Merge "Use drm@1.4 vintf fragments for drm@1.3" into sc-dev
2021-06-09 00:40:00 +00:00
Rahul Frias
56c2bf4b75
Merge "Disallow restoring an offline license multiple times" into sc-dev am: d1d0fa431a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14731758
Change-Id: I30af8ae7d119d618c37586400a3099e2ad1a95dc
2021-06-09 00:28:43 +00:00
Rahul Frias
d1d0fa431a
Merge "Disallow restoring an offline license multiple times" into sc-dev
2021-06-08 23:57:23 +00:00
TreeHugger Robot
c91c439686
Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)"" into sc-dev am: 25de0c7c32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14804251
Change-Id: I2c648ca43c15d72198a5c0cf4fac75eae4fd4562
2021-06-04 23:57:42 +00:00
Alex Dale
b7fda60aaa
[DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)" am: ad0d66c7e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14804251
Change-Id: I69e8ac23825dd2703f6c71c91c6626b022fde886
2021-06-04 23:57:41 +00:00
TreeHugger Robot
25de0c7c32
Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)"" into sc-dev
2021-06-04 23:40:05 +00:00