Commit Graph

7327 Commits

Author SHA1 Message Date
Cong Lin
09ffb9919a Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 am: cdf5ef3879
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: Iff89968f42419270510ef39a4e1d946f9dc21e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:50:08 +00:00
Cong Lin
cdf5ef3879 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

Change-Id: I2247d525b445c0f1097cd2a8afec814ccac4a814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:14:24 +00:00
Cong Lin
9651c61e25 Fix session id in dynamic adapter and re-generate L3
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/173330

Skipping files that are not in android from the CL above.

Original commit message:

Pass the real oemcrypto session id from `pair.session` instead of
`session`, since `session` can be changed when L1 and L3 are running in parallel and `session` in that case may not be the correct oemcrypto session id any more.

Also adding a few missing v18 L3 functions pointers to the dynamic
adapter.

Need to re-generate L3 since the L3 sources changed.

Test: L3 unit tests
Test: GTS dash policy tests and Dexter tests
Bug: 271290471
Bug: 279967915
Change-Id: Idc44d57ca38eb1de24c0038917800e37c25b9afc
2023-05-01 19:25:27 +00:00
Alex Dale
9ac44fe2cb Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 990b79e0a1 am: 67326b600c am: c86d2892a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I872b59961828dc7e412e29cd64b43781bd74b5a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:35:33 +00:00
Alex Dale
2411a9e1df Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: d9deaf40c3 am: ddc623a729 am: e0cfc3aaaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I963b7ce97a29b9bd48f3e965548ddf30be533acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:24:23 +00:00
Alex Dale
a2ccdbd79f Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 am: 65dc08a6a1 am: 2af28ea321
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ia0a9454ef9a189e91b9dcc154d0d7d8e1497fd84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:18:42 +00:00
Alex Dale
698522f8bf Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 am: 5e645f59dd am: 29117018ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: If8bd97e015acd0e72831fee2b72f6c5329bb1d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:14:39 +00:00
Alex Dale
c86d2892a6 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 990b79e0a1 am: 67326b600c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I063146c90b5d3b97ece226a2959a1b5fb4840e4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:10:06 +00:00
Alex Dale
e0cfc3aaaa Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: d9deaf40c3 am: ddc623a729
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I17bf7af0dfab71dc7fc9b8047d22caea10bcf907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:09:20 +00:00
Alex Dale
0184ce64a4 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 am: ba62072d25 am: b4a74dda35
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I6b29f6d688cff96777de31e395e190a179cfc11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:09:12 +00:00
Alex Dale
d2fd6bded7 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 am: a3f9eb8074 am: f2be057561
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I2dac64e013664ead356b74b487c8ec7fce3e51ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:54:37 +00:00
Alex Dale
ce1cb9dd20 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 am: a70355ef3d am: 0c9e7ced04
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: Iffc9cce9bc488dc5b7f0b41b0dd26dd147e901d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:45:48 +00:00
Alex Dale
5d6587d3b0 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 am: f77886adcf am: b9e57c48b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I21c785a79a9109d22f285fe93f9d15f3d28c3e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:39:34 +00:00
Alex Dale
2af28ea321 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 am: 65dc08a6a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I3faf9fea4cf317c6caa0299bb450d060aa529cdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:57 +00:00
Alex Dale
8fda9c524c Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 30a7e4e41a am: 8a12146aa1 am: 078b178f8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I664997f966813f1b34f36eebf910e7586096cee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:49 +00:00
Alex Dale
29117018ed Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 am: 5e645f59dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: Id08f1d437c4b81a57e8e142311a539b57bb17351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:48 +00:00
Alex Dale
b4a74dda35 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 am: ba62072d25
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: Ic795afe9ee8fb8659941ee61033be4ede9181205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:42 +00:00
Alex Dale
67326b600c Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 990b79e0a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: If537bb7bdd358c56bf37a71338a8710bff46fb92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:37 +00:00
Alex Dale
ddc623a729 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: d9deaf40c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I77f4008e432acf771b2f3f1cbdc1b17b5af6f764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:00 +00:00
Alex Dale
f2be057561 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997 am: a3f9eb8074
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I054d24eb7fe7e24c89f22017ea4ae45bc18adb89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:07:58 +00:00
Alex Dale
990b79e0a1 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ic6441e51c9b69827d301d5354cf319ed74bdb31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:07:38 +00:00
Alex Dale
0c9e7ced04 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822 am: a70355ef3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: Iaf07f33fbdf634853a9de1ba64546fb4e881e605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:07:36 +00:00
Alex Dale
b9e57c48b0 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848 am: f77886adcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: Ic439ee62bc198c0f90ce25dc401cbd3b03735f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:07:02 +00:00
Alex Dale
078b178f8c Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 30a7e4e41a am: 8a12146aa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I00c484ac3d66a2e1204b6675b2f079e434fe3a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:06:44 +00:00
Alex Dale
d9deaf40c3 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I1bb402c80a36f0fdc8b05d7510990193805a1681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:06:36 +00:00
Alex Dale
65dc08a6a1 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: I571270121f287d66d36ba4edcb025ac750c7ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:50:49 +00:00
Alex Dale
5e645f59dd Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I89f91af785c5c8e75fdc5a0e263ea7e329b59a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:50:23 +00:00
Alex Dale
ba62072d25 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I218eb3950be0fc7686ccc34bb64f7244310c9be1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:49:29 +00:00
Alex Dale
1020db3fd7 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 7c24330ea9
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ic460c355c0054022bdd9d42774fa899834174c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:48:24 +00:00
Alex Dale
a3f9eb8074 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f am: 2747f5f997
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Iac56c6efb88a505153b5ed5ddd752c50199c69d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:47:57 +00:00
Alex Dale
a70355ef3d Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: 1ada326822
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I3748cf75bfcd81edf0c6803844b6682943355b3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:47:24 +00:00
Alex Dale
f77886adcf Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 600c37d848
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I459f3f5c407fda26683aa3ddd18c10b3b4088a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:47:15 +00:00
Alex Dale
92e4664459 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8 am: e61b02b417
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: Ic5b8ed9b5c9b0088cb03b5d41fcb2a6c7360c184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:46:41 +00:00
Alex Dale
153de982ca Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: e4593c5836
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I54c088c8fd6cbf06edb332510f080bf205d60206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:45:43 +00:00
Alex Dale
8a12146aa1 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675 am: 30a7e4e41a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I94e054184075c7145c772abcff15c7e95268e77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:30:55 +00:00
Alex Dale
7c24330ea9 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ie069f3802cf7e65ed7cb1b39858ad37114f3c25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:30:06 +00:00
Alex Dale
2747f5f997 Merge "Allow metrics history to outlive the Android CDM." into udc-dev am: 3e650cfd9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22914977

Change-Id: Ib5fc267391fb3c512eb0df864116c33af44a30a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:29:45 +00:00
Alex Dale
e61b02b417 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I1e41ab9e15d3394f6886d292d20d14e42806ccd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:29:07 +00:00
Alex Dale
1ada326822 Merge "Include metric history in dumpsys." into udc-dev am: 7b32faf9f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794477

Change-Id: I1728dc0c1f5a267f585528b8696b0f9795827878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:29:01 +00:00
Alex Dale
3e650cfd9f Merge "Allow metrics history to outlive the Android CDM." into udc-dev 2023-04-29 00:17:49 +00:00
Alex Dale
7b32faf9f8 Merge "Include metric history in dumpsys." into udc-dev 2023-04-29 00:15:57 +00:00
Alex Dale
600c37d848 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I2301c09456e5ded57e7627dad111fc01b4296cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:09:23 +00:00
Alex Dale
e4593c5836 Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: Iaac091db712fa3e0069179bb6779407cf4c14967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:07:32 +00:00
Alex Dale
30a7e4e41a Merge "Added metrics history for WV CDM for Android." into udc-dev am: b5a7412675
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22794476

Change-Id: I52dd951e7ebdd8252151feeb0754d8386796fcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:03:20 +00:00
Alex Dale
b5a7412675 Merge "Added metrics history for WV CDM for Android." into udc-dev 2023-04-28 23:39:33 +00:00
Kyle Zhang
1aed4f6cdb Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: b4bf3eca79 am: 0f1b379d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I7ad9165cf79ba0123af703f9b8713bb09f974e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:35:57 +00:00
Kyle Zhang
40a91e9f4b Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: b0c01b626f am: 9bcb153d53
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I03b2d9e26c09f5c7a5251748f3c4c8828e4b3616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:35:53 +00:00
Kyle Zhang
e81e7fb950 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: 17d8250be7 am: 821e12e359
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I3516375adceb2b843027c53fbc19e270591b76e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:20:24 +00:00
Kyle Zhang
5b25a3c618 Merge "Create different targets for each Widevine apex" into udc-dev am: c01cd91d92 am: 7377a5d5fd am: 7897f6d232
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22604302

Change-Id: I4557207c508b8ef9b21a8d4e4dc1b48d3b75fe4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:20:18 +00:00
Kyle Zhang
0f1b379d90 Merge "Fix prebuilt apexes" into udc-dev am: 5409567ef9 am: b4bf3eca79
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22787524

Change-Id: I3a6ce55292f5d18faa6111b613782bb11e6adf7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 22:51:15 +00:00