Commit Graph

5372 Commits

Author SHA1 Message Date
Edwin Wong
1e539cd550 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 1a04368a9e -s ours am: 81ecbed63a am: 0726cebfad -s ours am: 773605718b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1317214a6948e7f5aa8fe719c11e9d59537f8895
2021-06-02 23:48:16 +00:00
Edwin Wong
773605718b [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 1a04368a9e -s ours am: 81ecbed63a am: 0726cebfad -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibd49cb166d3d70c2c4b6345351a73a069984c2c0
2021-06-02 23:42:45 +00:00
Edwin Wong
0726cebfad [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 1a04368a9e -s ours am: 81ecbed63a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Id620972719e7df47cbde546c6a5788b390e9e9ff
2021-06-02 23:25:43 +00:00
Edwin Wong
81ecbed63a [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5 am: 1a04368a9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I63f905b093c4f151a026adc123ae66120483cb17
2021-06-02 23:17:46 +00:00
Edwin Wong
1a04368a9e [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours am: e75f7c63b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Ida8db64dddf24fcfcc2ee83d035e6bd79ec240ea
2021-06-02 23:03:23 +00:00
Edwin Wong
e75f7c63b5 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158 am: d74cf5a35f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I983a6944369ff77e27c8d64fba5937dffc3554de
2021-06-02 22:47:30 +00:00
Edwin Wong
d74cf5a35f [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours am: 787f7e2158
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I84bf657fa0999fda46a89c02260ce31323164b9e
2021-06-02 22:25:26 +00:00
Edwin Wong
787f7e2158 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: a5c14b7afb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fa1dadd8d1294eff10ba86b9a7adf49e08e3bca
2021-06-02 22:04:24 +00:00
Alex Dale
64770b754d [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 am: f5917c0704 -s ours am: 94482a800f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a22e6f6660b4bd108307ed1091af78b375afe4a
2021-06-02 20:49:42 +00:00
Alex Dale
780df049ca [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 -s ours am: c0caabd0d5 am: 94ee23d5b6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I15e5a11f4d99ad771176930fd6fb9aaf4b708b8d
2021-06-02 20:49:18 +00:00
Alex Dale
94482a800f [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 am: f5917c0704 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdc02a7fe82b185d6f152ed1451f2413d73abb14
2021-06-02 20:33:49 +00:00
Alex Dale
94ee23d5b6 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 -s ours am: c0caabd0d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14605397

Change-Id: Idb30bde9d75a8c72c9639db5577013214c0cdabd
2021-06-02 20:31:45 +00:00
Alex Dale
c0caabd0d5 [automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib974b26b26b66590c6887a7760627e8b2b001840
2021-06-02 20:17:09 +00:00
Alex Dale
f5917c0704 [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14605397

Change-Id: I4517d183e287da0b053dd7045c44139f74ded5dc
2021-06-02 20:13:00 +00:00
Alex Dale
06b637ed95 [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)"
This reverts commit f6f5099604.

Reason for revert: Feature missed deadline

Bug: 135283522
Change-Id: Ic86930ee3444c5a6aa1d78ae3a12a9030c29ef92
2021-06-02 17:41:53 +00:00
Bill Rassieur
2c9d611918 Merge sc-mainline-prod to master.
Change-Id: I38d001b7a04e123be08f80c5d964dcd2c0948a51
2021-05-27 20:13:21 +00:00
Alex Dale
7825ef710a Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 am: 0c32615d69 am: 72ecc1cc46
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: I97e5e29f8d20ebfdc8dfb2d3d701b309446c9d23
2021-05-26 23:09:51 +00:00
Alex Dale
dda99b0adf Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 am: 7291bb5fc5 am: a48adbebee
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: I6a65a4a0b913e4e53abe103a5daf12d29bea2239
2021-05-26 23:08:44 +00:00
Alex Dale
72ecc1cc46 Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 am: 0c32615d69
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: I933da5bbfd9ae7fbb0d6f198206ee8627195e3ff
2021-05-26 23:01:47 +00:00
Alex Dale
a48adbebee Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8 am: 7291bb5fc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: Ida1f6ae19721d74bd420696e501cdfb1b0bd39fd
2021-05-26 23:00:07 +00:00
Alex Dale
7291bb5fc5 Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: I787b73bebb3be6efc37293540980878611e524f0
2021-05-26 22:46:26 +00:00
Alex Dale
0c32615d69 Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: If9e45c38e7408811abd7c78ee10536ddbeb71a54
2021-05-26 22:45:33 +00:00
Alex Dale
0af7344cb1 Merge "New usage entries are moved lower after creation." into sc-dev am: 9c47be6aa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14354899

Change-Id: Icce10f71c519411d638b725217c84ed0a3347b41
2021-05-26 22:45:28 +00:00
Alex Dale
9c47be6aa8 Merge "New usage entries are moved lower after creation." into sc-dev 2021-05-26 22:31:03 +00:00
TreeHugger Robot
70caa5a9a8 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed am: 818d93da2b am: c0e81feeb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: Id92784316b2bfc1abdef6d442887353fe578c79a
2021-05-26 00:52:40 +00:00
TreeHugger Robot
ab13d34235 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed am: c03abd803e am: 1015e07fa6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: Ia49ab3f12f62a874466a0e3b0ed81052754e2321
2021-05-26 00:51:13 +00:00
TreeHugger Robot
c0e81feeb4 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed am: 818d93da2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: Ie7f916fd4d9be326e8d55d06aeadc5f580aec204
2021-05-26 00:37:59 +00:00
TreeHugger Robot
1015e07fa6 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed am: c03abd803e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: Ia1a34bbf9345785b2a1de059170f01ea8967954e
2021-05-26 00:36:11 +00:00
TreeHugger Robot
c03abd803e Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: I980597582e858da14aee587535fd310fbcb545bb
2021-05-26 00:23:01 +00:00
TreeHugger Robot
d5a970aae4 Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: I3b123d07993da703dd8ba97fd5de22a986451af9
2021-05-26 00:21:31 +00:00
TreeHugger Robot
818d93da2b Merge "Sync L3 headers in sc-dev" into sc-dev am: 5af95f48ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14669194

Change-Id: I29f7456d0afe12b2a4f578e290dde5b2c6643c0c
2021-05-26 00:21:09 +00:00
TreeHugger Robot
5af95f48ed Merge "Sync L3 headers in sc-dev" into sc-dev 2021-05-26 00:02:54 +00:00
Fred Gylys-Colwell
b13895f156 Add fudge to duration tests am: 20833734e1 am: 0f39baa33c am: 479ef5ce8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: I47e2a9c781218519d0ad940567389411a9a73b19
2021-05-25 23:00:42 +00:00
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
479ef5ce8e Add fudge to duration tests am: 20833734e1 am: 0f39baa33c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

Change-Id: Ibf53a3a65a7ee05700d7d4cad0909059fcd52816
2021-05-25 22:40:04 +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
f11394cfe6 Add fudge to duration tests am: 20833734e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14664668

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

Change-Id: Icf3d6a82b7c537839dbee2d7dcb6145f8fc4b1b5
2021-05-25 22:22:11 +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
cb15eaa2bc 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: Id9bc6bd5fe66da4c998ccb0b7d56b30f934dcb34
2021-05-25 20:36:26 +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