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
62b4254082
[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 am: 3d706ae999 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496
Change-Id: I00548f927ece26f425f0039fa4f0853201cb7a97
2021-06-04 01:45:23 +00:00
Edwin Wong
54e178b232
[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 am: bd525b73f5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308
Change-Id: I4d647421b45476e4d39874c65dd48a7896cc15f6
2021-06-04 01:45:12 +00:00
Edwin Wong
e3f3c40ddc
[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 am: e8b6f19ba8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496
Change-Id: I41cb0eb263ee1fa01b817557828f98f83f0f2a18
2021-06-04 01:43:45 +00:00
Edwin Wong
11d3d8c28a
[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 am: 83eda0a36d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308
Change-Id: I059b741c283ab496346d5d610151ad3d7bdc9bc5
2021-06-04 01:43:33 +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
Alex Dale
a650ddacef
[automerger skipped] [DO NOT MERGE] Revert "Restructed reference root of trust (2/3 DRM Cert)" am: 06b637ed95 am: 0ddbdd0fe5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/14605397
Change-Id: Ifc78a292d495394770e904e46ff572db182b8e8e
2021-06-03 00:25:48 +00:00
Edwin Wong
a5bd53e70b
[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: 26d46d7f44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496
Change-Id: If4aefc85a0d56a45f85bc43e72201f0affaee887
2021-06-03 00:09:56 +00:00
Edwin Wong
e60313da30
[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: e0ac595bce -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13412308
Change-Id: Id86ee0ad74b112fa31e341e6b798362c182ae527
2021-06-02 23:50:24 +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
b740b4fd88
[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: 7be256c177 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/13424496
Change-Id: Ic119fd5edf177d3962b6da5c4b89a033574d948a
2021-06-02 23:48:54 +00:00
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
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
3f1fb450ea
[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: Ie2ac48989cea8938e21a4b407cafb7cefbecdf38
2021-06-02 23:40:43 +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
daa7c2bb8d
[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: I9be3217b288ee77313830ab9cb19e36a55f4764e
2021-06-02 23:27:46 +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
391d44e4b4
[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: Id41d0ffd156e579b34a8482ea2de0cf863f840b7
2021-06-02 23:26:29 +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
0fea936ddc
[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: I9c9978927a28ee49194bfd68afa9e02c6a8079c7
2021-06-02 23:26:01 +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
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
