Commit Graph

7155 Commits

Author SHA1 Message Date
Alex Dale
3d59829baa Merge "Exclude the default CDM from metrics history." into udc-dev am: 2e84e8b5f7 am: 13d3ef216f am: b49f99dfa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22957292

Change-Id: I3fb4138c4e433f4101a311e20ee4d2059c140258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:06:07 +00:00
Alex Dale
b49f99dfa4 Merge "Exclude the default CDM from metrics history." into udc-dev am: 2e84e8b5f7 am: 13d3ef216f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22957292

Change-Id: Ie5f540fb0bbcd0bba161bd870ca7d4edf67547e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 20:23:44 +00:00
Alex Dale
13d3ef216f Merge "Exclude the default CDM from metrics history." into udc-dev am: 2e84e8b5f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22957292

Change-Id: Id2d7277082d1c95195476ac7e23b0c1982f60100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 19:39:49 +00:00
Alex Dale
2e84e8b5f7 Merge "Exclude the default CDM from metrics history." into udc-dev 2023-05-03 18:44:06 +00:00
Alex Dale
cf5d517495 Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0 am: 9e7df66c95 am: 412f09271d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: I5da827f400eec0dda7cde9aed8490070c431bcb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 03:24:54 +00:00
Treehugger Robot
39db82acd7 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2 am: 2691751782 am: 3419c6bf20
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: Id70dae2553a98dc7e16a3e07904c54e343fe3847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 03:23:57 +00:00
Alex Dale
de16fb6949 Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0 am: 2262c95040 am: 7f6c645c6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: Id1f3e2e30301bd5ca3cdeeb5c0ef84fe079d2df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 03:02:30 +00:00
Treehugger Robot
07e2053ad9 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2 am: 2a7cb87b06 am: 9c5dfe8a5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: I24070419ccaeadffe8427efb729ba980771f4abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 03:02:02 +00:00
Alex Dale
ac4b8d4d6f Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0 am: 9e7df66c95 am: 19e522ec4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: I4cf1356e0421aff2fbd5096104507abdc1c7d1f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 03:01:34 +00:00
Treehugger Robot
c180669fe5 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2 am: 2691751782 am: 1725aaba29
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: I0fcf54574ccffb1a632a8618efe397ef8afbccf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 03:00:55 +00:00
Alex Dale
7f6c645c6b Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0 am: 2262c95040
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: Ia602247750f7c821d8cd25bd0449ed44a220b6ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:41:41 +00:00
Treehugger Robot
9c5dfe8a5d Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2 am: 2a7cb87b06
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: I5e082affc513ad13eb1fcef873f4130b813eccdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:41:07 +00:00
Alex Dale
412f09271d Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0 am: 9e7df66c95
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: I7e70f9fdbb575e9c925f0f70fcf46db82406e1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:41:06 +00:00
Treehugger Robot
3419c6bf20 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2 am: 2691751782
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: Ie065e66cb67783872db9e041fca75f4bbc4cbc2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:40:43 +00:00
Alex Dale
19e522ec4a Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0 am: 9e7df66c95
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: I7e07d932853504620ad54fcc33b385be248068fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:37:02 +00:00
Treehugger Robot
1725aaba29 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2 am: 2691751782
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: Ife70ccd9f5b97f15211c28e6edaa663232d722cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:36:06 +00:00
Alex Dale
2262c95040 Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: I14989baacc6c5e1be0d9e0ace5e134632aec0591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:18:43 +00:00
Alex Dale
9e7df66c95 Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev am: 82709ebab0
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22956431

Change-Id: Ie93959d173cf8a78f041d9831bc77b61c7260c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 02:17:07 +00:00
Alex Dale
82709ebab0 Merge "DRM Pluging uses CDM core's generic crypto API." into udc-dev 2023-05-03 02:02:45 +00:00
Treehugger Robot
2691751782 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: If0e060c39e67234c8041c1b705bac047198eee6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:59:29 +00:00
Treehugger Robot
2a7cb87b06 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev am: c77b0a6bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22824317

Change-Id: I59726fd99ed16c995539fcd2489c02d106caba96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:54:05 +00:00
Rahul Frias
daa20899b0 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f am: ca7dc18668 am: ab757ecfb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: Ib374db0534f3861d32061c86c86049abe6e3c10e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:38:33 +00:00
Rahul Frias
42e3944ad1 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f am: 44d055dad1 am: 01c85c5b84
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: I60ccad54c356444c3f4bcee217ebf128dc94a7e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:19:46 +00:00
Treehugger Robot
c77b0a6bf2 Merge "Piped CdmEngine's generic crypto operations to Android CDM." into udc-dev 2023-05-03 01:16:23 +00:00
Rahul Frias
3b0b19e858 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f am: ca7dc18668 am: bf1f1dc2fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: Ida929070dc4ceae6b3db5942f8492720740a60a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 01:14:59 +00:00
Rahul Frias
01c85c5b84 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f am: 44d055dad1
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: I0b21b8725136bcc64de0c6eec5d1a9ef8d5acedc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:53:17 +00:00
Rahul Frias
ab757ecfb7 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f am: ca7dc18668
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: Ie177d87a3af532f947e446d89976e1d7ee4c8f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:53:02 +00:00
Rahul Frias
bf1f1dc2fa Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f am: ca7dc18668
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: I48440aa2b75136d91b95728f71e8267d6b4e8630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:50:56 +00:00
Rahul Frias
44d055dad1 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: I67ea216beb56e24dddccbd2741b3127a49007600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:11:32 +00:00
Rahul Frias
ca7dc18668 Merge "Add error details when offline license is not found" into udc-dev am: a4dc63581f
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22808261

Change-Id: I21706f7eb5e00ddf407502200a8370841eafdf1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 00:11:03 +00:00
Alex Dale
628d1ac38c DRM Pluging uses CDM core's generic crypto API.
[ Merge of http://go/wvgerrit/173170 ]

This CL updates the Widevine's Android DRM plugin to use the generic
crypto operations provided by CDM core rather than its own
implementation.

Bug: 274984456
Test: atest WvtsDeviceTestCases
Change-Id: I94e1c92c7da577aad5ec43bd3bf0bb380b607b80
2023-05-02 16:51:23 -07:00
Rahul Frias
a4dc63581f Merge "Add error details when offline license is not found" into udc-dev 2023-05-02 23:41:30 +00:00
Cong Lin
35ebdc3bd1 Fix session id in dynamic adapter and re-generate L3 am: 9651c61e25 am: dae2668d93 am: 8f2e922859
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22953666

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

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

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

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

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

Change-Id: I6818114f54c24bdecf2d8a846eea63cc8bcdd30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:55:49 +00:00
Cong Lin
dae2668d93 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: I9b6a55f4ad156e341c7fa56be4d9ea8d521f6abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:16:05 +00:00
Cong Lin
5c75bc6cf0 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: Ib37e118519e3d8021469dc5d87a065a520389b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 01:13:35 +00:00
Alex Dale
37f125a491 Piped CdmEngine's generic crypto operations to Android CDM.
[ Merge of http://go/wvgerrit/172010 ]

The CdmEngine provides an API for generic crypto operations that are
already used for the CE CDM.  This API is being exposed in the Android
CDM.  The parameter order of the Android CDM is modified to match the
existing generic crypto parameters used in the media DRM plugin.

Bug: 274984456
Bug: 29400687
Test: build x86-64 and Android
Change-Id: I3b286ebb011bd58754b7b8ea814ed46daf1f62f9
2023-05-01 15:50:39 -07:00
Alex Dale
da6437fe5e Exclude the default CDM from metrics history.
[ Merge of http://go/wvgerrit/173410 ]

The DRM plugin opens and closes many CDMs using the default identifier.
These metrics are not needed when checking the metric history and will
no longer be stored.  Default CDM metrics will continue to appear in
the live metrics list.

Bug: 239462891
Bug: 270166158
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Change-Id: I64662a44e9c084cc0f08c5a3f013dbf86374ac2d
2023-05-01 15:37:34 -07: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
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
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
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