Commit Graph

5044 Commits

Author SHA1 Message Date
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
Edwin Wong
3d706ae999 [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 -s ours am: 4dd2ec9fb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I43212780370c48611307112704ee6f9d69e83a06
2021-06-04 01:13:16 +00:00
Edwin Wong
bd525b73f5 [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 -s ours am: d18f460338
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I26d291845e9e61b2b25712438fbb2f023443bfc8
2021-06-04 01:12:59 +00:00
Edwin Wong
e8b6f19ba8 [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 -s ours am: f5f1dfa775
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I15c2a590d0ee49827b8aafc1c5a7c91c9f1d1e83
2021-06-04 01:12:04 +00:00
Edwin Wong
83eda0a36d [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 -s ours am: 219cf6290c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: I74073ae722251cb1367c7e19f740777f39318f0f
2021-06-04 01:11:49 +00:00
Edwin Wong
4dd2ec9fb6 [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 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I354becc251fa45faf418e2ebf5bc57dad472c60d
2021-06-03 07:21:22 +00:00
Edwin Wong
d18f460338 [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 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f6e236e974c263048f216eedb5c711b144a4fdf
2021-06-03 07:20:53 +00:00
Edwin Wong
f5f1dfa775 [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 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42d85251c562139c94be6ee0bea684895ba7c294
2021-06-03 07:18:52 +00:00
Edwin Wong
219cf6290c [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 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib289cd9f8012d2906eb85652d55a785f09594fde
2021-06-03 07:18:20 +00:00
Edwin Wong
26d46d7f44 [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: 6d7fb95c90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0fd3f8c7b091353fb9bfc45c77fb32100f456fe
2021-06-02 23:49:20 +00:00
Edwin Wong
e0ac595bce [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: b616798ff7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80e96716db76a6f56a2d10c0d59083d1dbc860f6
2021-06-02 23:44:34 +00:00
Edwin Wong
7be256c177 [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: 4527a65122 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80de50c2c1459b682ec5118f0aaffbe2ac31a728
2021-06-02 23:43:13 +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
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
Edwin Wong
b616798ff7 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308

Change-Id: Ia48e0e631ff396b63d6fe526b51473e53fe57b26
2021-06-02 23:27:30 +00:00
Edwin Wong
4527a65122 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: Icc58febeb32d5c6d50a5491f05606e72d4211bf8
2021-06-02 23:26:15 +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
ffbc1dfdd2 [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 skip reason: subject contains skip directive

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

Change-Id: Ic0fefdfafdfa0024f12d307f4d3736ade2b570a7
2021-06-02 23:18:47 +00:00
Edwin Wong
255f525c31 [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 skip reason: subject contains skip directive

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

Change-Id: Id300ffcd7ed8b9f37d4758ac802ae3427111c0b5
2021-06-02 23:18:39 +00:00
Edwin Wong
17c2aaabb4 [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 skip reason: subject contains skip directive

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

Change-Id: I6782e4de8ddc7bf62d38790f7f9d24b64b02f63d
2021-06-02 23:18:00 +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
b2ebc85c7e [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I7ae3b31b31288419a45b585ae5dae196d80bcdfb
2021-06-02 23:04:49 +00:00
Edwin Wong
6f307fb311 [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: Iac6fa4a12541c9e95c733186e4607d7c52973e1d
2021-06-02 23:04:37 +00:00
Edwin Wong
38654a3fd7 [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
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: I2c246da19bedc2440e777c8edddf2e5619d8fa74
2021-06-02 23:03:37 +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
a9fbf4de43 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369 am: 85bbf55e91 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id5014667cb634351d19e8b4012d2db0c7f32d365
2021-06-02 22:47:40 +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
85bbf55e91 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours am: 62e23e0369
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496

Change-Id: Ib88e34bacd5afb0ead74ba2a6526083366ea2822
2021-06-02 22:25:40 +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
62e23e0369 [automerger skipped] [RESTRICT AUTOMERGE] Fix potential decrypt srcPtr overflow. am: 0253cb580e -s ours am: ad1d8778e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6f783b3af331eedd1b9f1a1a887990978c0c52e
2021-06-02 22:04:34 +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
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
ad0d66c7e6 [DO NOT MERGE] Revert "Restructed reference root of trust (1/3 Keybox)"
This reverts commit e4ee4eb404.

Reason for revert: Feature missed deadline

Bug: 135283522
Change-Id: I4ee2caac2dadfcc3e145b9c9b977d216d4edd929
2021-06-02 20:00:16 +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
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
9c47be6aa8 Merge "New usage entries are moved lower after creation." into sc-dev 2021-05-26 22:31:03 +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