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

5060 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cong Lin
1860e3f0f0 Fix L3 clock loading issue am: 61218ec6cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14930112

Change-Id: If1885fe6aa662aba4d5d1cc710536f031c64223c
 2021-06-24 18:46:27 +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
44fdfb8047 Update VersionNumberTest.VersionNumberChangeCanary am: 52d3c9f7c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14899053

Change-Id: I335ad1d8f528fe22ceff0100e922fe503f161e86
 2021-06-15 18:06:46 +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
TreeHugger Robot
876b9b4229 [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: I05f5f8335cf052d6125bbdfec9206cf594d013f8
 2021-06-10 00:05:55 +00:00
Cong Lin
d71c11a0d1 [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: I21d103eb254b3495f2c76543283ff0c9f090d01c
 2021-06-10 00:05:55 +00:00
TreeHugger Robot
126d17c4d8 [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: I1c6dd8b8fd8b7eb34b7d7f1e0d1d3a1727810cd9
 2021-06-10 00:05:41 +00:00
Cong Lin
cfe74e1a40 [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: I56e712c46274ad9a2c66ae9694a1839cdfeb6183
 2021-06-10 00:05:41 +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
29af078da9 [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: I9254cc42816772b3176a2ca67559e6633d90af78
 2021-06-09 22:11:09 +00:00
Cong Lin
9abeb28152 [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: Ia7a6a13daa49997725ebde2e963236260129cd2e
 2021-06-09 22:11:08 +00:00
TreeHugger Robot
2f3faed949 [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: I1a061f4f87e9f6461012dc6daced8e662cd8ff03
 2021-06-09 22:11:03 +00:00
Cong Lin
be3b8facac [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: I803dfdab01a17fae97f817d9bbdd0026a3960372
 2021-06-09 22:11:02 +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
9cb5e82def 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: I85343cb1b48d73aec529070df76a8aa8ef35ff14
 2021-06-09 21:41:07 +00:00
Cong Lin
b1ab253abe [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: Ic4f65ee841073da74452a3cc43eff7e8992b07ca
 2021-06-09 21:41:05 +00:00
TreeHugger Robot
9144ae5f57 [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: I4d21a4de514810ff2324178876fb67eae3fa050c
 2021-06-09 21:41:01 +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
c874985938 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: I5254bcb4aa55ba7e0e68aad045a1a0a33daaa437
 2021-06-09 00:57:40 +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
2aa4c5ad7d 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: If1323538ca2d345469363066022487dae493fd64
 2021-06-09 00:30:17 +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
fbd98b5852 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: I3105fd60380b0032d24a5f7f080da7c7e7680c87
 2021-06-04 23:56:05 +00:00
Alex Dale
f972e9b6ad [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: I0ae95eeb1112cb1746da0a85c1e739b33b3981f9
 2021-06-04 23:56:04 +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
Robert Shih
a81ace2ea4 Use drm@1.4 vintf fragments for drm@1.3 
This avoids widevine crashloops in case partners updated
vendor/widevine without updating device makefiles.

[ Merge of http://go/wvgerrit/126103 ]

Bug: 178110290
Bug: 186502089
Test: GtsMediaTestCases
Change-Id: Iafd9e62beadf5a099a76ab6a987ffd9598e5ef25
 2021-06-04 19:45:16 +00:00
Rahul Frias
999fbeb666 Disallow restoring an offline license multiple times 
[ Merge of http://go/wvgerrit/126063 ]

As a side-effect of fixing b/161865160 CDM checks to flag reloading
of an offline license were removed. This left it to the OEMCrypto
which varied by device implementation. Checks are being reintroduced
to the CDM and will help MediaDrm return the expected error
ERROR_LICENSE_STATE.

In addition restoring an offline liense to a session where a license
is already loaded will be rejected.

Bug: 184608310
Bug: 182208685
Test: WV unit/integration tests
      MediaDrmTest.testMultipleLoadKeys
Change-Id: Id8ee069d22819f7823aa6af11a41f35f0a04ce0a
 2021-06-04 03:20:15 -07:00
Edwin Wong
6d7fb95c90 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 am: 85bbf55e91 -s ours am: a9fbf4de43 am: b2ebc85c7e -s ours am: ffbc1dfdd2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I2b1bbcb8b4d3d5232332d8e37d97ff4f1b521ce1
 2021-06-02 23:40:34 +00:00