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

5247 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6d1ae460b9 [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 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9aeafc7caaf0df68cfe68a41b7cf6c210529b838
 2021-06-09 22:12:24 +00:00
Cong Lin
0934da5443 [automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: e4cfcab140 am: 23fa208349 -s ours am: 216e8317d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ea99ce98283a359a68a9f71658f7da6710a50b5
 2021-06-09 22:12:23 +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
Automerger Merge Worker
e41d9c7333 Merge changes from topic "am-a71762b12e7843a6bbdb49172733e426" into sc-v2-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into sc-dev am: 1f1f35f56a am: 9cb5e82def -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: 563a79bd8b am: b1ab253abe -s ours
 2021-06-09 22:00:49 +00:00
TreeHugger Robot
c38170629b [automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into sc-dev am: 1f1f35f56a am: 9cb5e82def -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I378ce9f67fcf20ac3de5e35845502650d55fa9ca
 2021-06-09 22:00:48 +00:00
TreeHugger Robot
63dffb1123 [automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into sc-dev am: 1f1f35f56a -s ours am: 616e2f171e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14645772

Change-Id: I93fbf09c4f1c054a2e282556b40c1fb4cbe0bf6f
 2021-06-09 22:00:35 +00:00
TreeHugger Robot
bc746221af [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 -s ours am: 13a64ea3cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14628748

Change-Id: I408f31de530e6cb2ec8e69fc4a32fc94e0ac225c
 2021-06-09 22:00:24 +00:00
Cong Lin
86fe20570d [automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: 563a79bd8b am: b1ab253abe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f9ed5cb50322a0b150dcdc3e2f70ad944d3485c
 2021-06-09 22:00:06 +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
TreeHugger Robot
37ade0c050 [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 am: 9144ae5f57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I982dac3487a3c5363f365d73c74ce16db4423196
 2021-06-09 21:54:16 +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
cf1756c004 Merge "L3 Load RSA private key from two parts [sc-dev]" into sc-v2-dev am: 7bcf74adc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14722694

Change-Id: I6fea5bbbfdf7562c1a5178852cab55aa42d734e4
 2021-06-09 21:53:22 +00:00
TreeHugger Robot
616e2f171e [automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into sc-dev am: 1f1f35f56a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If3ac1bd341fb305880bd993537263222ae1d8e9e
 2021-06-09 21:42:27 +00:00
TreeHugger Robot
13a64ea3cc [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 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60809018483ef09a42d7287507e47ca7b8f05284
 2021-06-09 21:42:24 +00:00
TreeHugger Robot
7bcf74adc9 Merge "L3 Load RSA private key from two parts [sc-dev]" into sc-v2-dev 2021-06-09 21:42:14 +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
fbe5529f88 Merge "Use drm@1.4 vintf fragments for drm@1.3" into sc-dev am: b791286119 am: c874985938 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14842900

Change-Id: Ifeb648ef1b4a58915c387f120f023f5ea83e1702
 2021-06-09 01:13:33 +00:00
TreeHugger Robot
11b2f163b3 Merge "Use drm@1.4 vintf fragments for drm@1.3" into sc-dev am: b791286119 am: 44e24b148f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14842900

Change-Id: I7c7dd928d493c20a951a532d95cac88060fecbef
 2021-06-09 01:12:38 +00:00
TreeHugger Robot
44e24b148f 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: I0fce9d92e4babe3756fd044f4b7e1f6f41a4eb66
 2021-06-09 00:59:17 +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
Rahul Frias
0ce57c71c1 Merge "Disallow restoring an offline license multiple times" into sc-dev am: d1d0fa431a am: 2aa4c5ad7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14731758

Change-Id: I88ac61d2a7e8f816e89f9a4d747c3760fc301bab
 2021-06-09 00:52:51 +00:00
Rahul Frias
bc3793430e Merge "Disallow restoring an offline license multiple times" into sc-dev am: d1d0fa431a am: 612f8bc0a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14731758

Change-Id: Ibfaa9e5aa99b126c4c580314153e0bdaabb17402
 2021-06-09 00:51:11 +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
612f8bc0a9 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: Iabf693abbe60ec39b7b0a67939961d507b45a9a6
 2021-06-09 00:30:49 +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
7b3695eaa3 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)"" into sc-dev am: 25de0c7c32 am: fbd98b5852 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d3f4ec273a5e635ee5da6f4e17e20aeb9823369
 2021-06-05 00:14:32 +00:00
Alex Dale
266e306b76 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)" am: ad0d66c7e6 am: f972e9b6ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8707bf9fb6d45a3c1db30676729a6738402a967
 2021-06-05 00:14:31 +00:00
TreeHugger Robot
7e37faaeef [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)"" into sc-dev am: 25de0c7c32 -s ours am: 394d6073e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14804251

Change-Id: Idf8ade0ac2cbb3f047f6a5e5f02c5d6a9c3b49f8
 2021-06-05 00:13:08 +00:00
TreeHugger Robot
394d6073e2 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)"" into sc-dev am: 25de0c7c32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30465c23aa0f5658f6d36d548cdc8c6fd2db75ca
 2021-06-04 23:58:59 +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