Commit Graph

5480 Commits

Author SHA1 Message Date
TreeHugger Robot
47327d5cc7 [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: c38170629b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I95fd9c802855a5132440e82ea168951a14705f6b
2021-06-09 22:13:10 +00:00
TreeHugger Robot
a17e7260b7 [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 am: 63dffb1123 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6719c56e3eadc1882dff78119ec0083da84abdb7
2021-06-09 22:11:23 +00:00
TreeHugger Robot
262863c40e [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 am: bc746221af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1717cad26f45169d880ec4879b5891eee6990e36
2021-06-09 22:11:18 +00:00
TreeHugger Robot
42a340eba8 [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: 37ade0c050 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2aee72cc5b16ebb8cf21161004b72d39f0580a7d
2021-06-09 22:11:13 +00:00
TreeHugger Robot
f145a7c2e7 [automerger skipped] Merge "L3 Load RSA private key from two parts [sc-dev]" into sc-v2-dev am: 7bcf74adc9 am: cf1756c004 -s ours
am skip reason: skipped by user conglin

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

Change-Id: I8dbc6a762f98c41ac0a3d85276e607f448f6b5ab
2021-06-09 22:11:04 +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
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
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
a603c14f43 [automerger skipped] Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" into sc-dev am: 1f1f35f56a am: 15be9f4b29 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23743b51cf365179aead2e7f70f86ac3b0f638c3
2021-06-09 21:53:11 +00:00
Cong Lin
dd8f7dad35 [automerger skipped] [RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate am: 563a79bd8b am: 7a5f8fc820 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I62355ec29e8190272bd138b6183257f3c0bc3b1c
2021-06-09 21:53:11 +00:00
TreeHugger Robot
7ec9b5c37d [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: e12c1111ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: If10711d2698962c39a6b44ec2a54783a70cbcadd
2021-06-09 21:52:54 +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
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
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
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
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
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
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
Cong Lin
3e25e65b4d Merge "[RESTRICT AUTOMERGE] L3 Load RSA key from two parts and re-generate build" 2021-06-09 20:32:13 +00:00
TreeHugger Robot
ca226ac063 Merge "Use drm@1.4 vintf fragments for drm@1.3" into sc-dev am: b791286119 am: c874985938 am: fbe5529f88
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14842900

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

Change-Id: I95f737f303c654c654c7b6cab0d5bf6a31c4b155
2021-06-09 01:27:17 +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
c8a8c2f876 Merge "Use drm@1.4 vintf fragments for drm@1.3" into sc-dev am: b791286119 am: ad70624aae
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14842900

Change-Id: Ic0ccd418b539a2b1cec403cbf4c4587311cc0a19
2021-06-09 01:12:05 +00:00
Rahul Frias
1775d06299 Merge "Disallow restoring an offline license multiple times" into sc-dev am: d1d0fa431a am: 2aa4c5ad7d am: 0ce57c71c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14731758

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

Change-Id: I043df78fc612759afc17843adb9d5ff4a1c6360a
2021-06-09 01:05:11 +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
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
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
Rahul Frias
4fff0ec502 Merge "Disallow restoring an offline license multiple times" into sc-dev am: d1d0fa431a am: 56c2bf4b75
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14731758

Change-Id: I360cf14c69e35843870035706d4346c5becaf456
2021-06-09 00:42: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
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
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
8726874bd5 [automerger skipped] Merge "[DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)"" into sc-dev am: 25de0c7c32 am: c91c439686 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc714a796603a73a18865683fd93beb8ea5320f7
2021-06-07 03:04:12 +00:00
Alex Dale
ad97fb1530 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)" am: ad0d66c7e6 am: b7fda60aaa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3872e0cf322c59d192c92f6fb87d593adff4e8b6
2021-06-07 03:04:11 +00:00
Edwin Wong
ee3a6f0f09 [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 am: 3f1fb450ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie37a38b745f976c9e2601dee902e2ae3c9122a1c
2021-06-07 02:56:42 +00:00
Edwin Wong
2adaa7aefe [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 6f307fb311 -s ours am: 255f525c31 am: daa7c2bb8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I22f6585c117f54f9cf1468242266b71c9b1f4fbd
2021-06-07 02:56:32 +00:00
Edwin Wong
f795bae870 [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: 38654a3fd7 -s ours am: 17c2aaabb4 am: 391d44e4b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0abde8549d5ccccfe5162dc2379bf9ef1619f6bc
2021-06-07 02:55:47 +00:00