widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,273 Commits 2 Branches 0 Tags
e81e7fb95061bb737a6fac4fb6ac8d61e7d798eb
Commit Graph

7273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Moreland
680b990aee fix widevine fuzzer: c++_static and cc_fuzz 
c++_static and cc_fuzz interact badly

Fixes: 275500903
Test: widevine fuzzer starts and runs
Change-Id: I06b89b710c6f1f11d05756651391df3f682f872b
 2023-04-14 00:49:37 +00:00
Robert Shih
d258acb879 Return apex name for PROPERTY_VENDOR 
[ Merge of go/wvgerrit/c/cdm/+/170370 ]

Bug: 277620071
Test: WidevineHalTest
Change-Id: I05385358875723e20b13d3abb21a0deee9f35c29
 2023-04-12 15:36:38 -07:00
Alex Dale
bdc2668f9b Moved OEMCryptoResult string converter. am: de779e7545 am: 324907a296 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: I8a5de1ba6449fa1034e61c877f6de40e1f172aef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 03:00:10 +00:00
Alex Dale
a3e4ce17c1 Moved OEMCryptoResult string converter. am: de779e7545 am: e168e35355 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: I4d962828ebe521f2a2aa24926b80eadeed10f326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:59:25 +00:00
Alex Dale
324907a296 Moved OEMCryptoResult string converter. am: de779e7545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: Ic2cc0826602fdb1f53f2b8cf4185ecb3cd459048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:27:42 +00:00
Alex Dale
e168e35355 Moved OEMCryptoResult string converter. am: de779e7545 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22520102

Change-Id: I012477d1bc83989bb558ddf41efc0d52da7afa08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-12 02:27:01 +00:00
Alex Dale
de779e7545 Moved OEMCryptoResult string converter. 
[ Merge of http://go/wvgerrit/170073 ]

Removed the file "error_string_util.cpp" and its header, moving the
OEMCryptoResult to string converter to "wv_cdm_types.cpp".  This extra
file served little purpose, and created a dependency on the CDM utils
to the CDM itself.

This is part of the effort to fix the formatting of WV metrics; making
enum-to-string conversion uniform throughout the CDM.

Bug: 239462891
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: Manual testing with Google TV
Change-Id: I4bf95d26b623f5b8fa86bdb2578cbc4ee65125cb
 2023-04-11 14:08:30 -07:00
Cong Lin
6e1a7fad4c Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 am: a5a7d77896 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: I4d6013798814367ea8dff67d4e02ad1ea5fa3b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 20:12:26 +00:00
Cong Lin
e8a33c1ab2 Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 am: 83edd1b853 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: I951536e50d052201052023a942ee0b9de64d66a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:48:35 +00:00
Cong Lin
a5a7d77896 Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: I6c54961f0755ef911496e18819c6355fc5e97fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:35:03 +00:00
Cong Lin
83edd1b853 Merge "Fix invalid key session id" into udc-dev am: 9c844682a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22429576

Change-Id: Idd4e6479bd1e3eb10669f07d24456b43b1a77a07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:20:06 +00:00
Cong Lin
9c844682a6 Merge "Fix invalid key session id" into udc-dev 2023-04-05 17:41:43 +00:00
Rahul Frias
d31a4dec56 Force a reprovisioning on device renewal 
[ Merge of http://go/wvgerrit/169374 ]

Device renewals used to require that OEMs remove provisioning
certificates as part of the OTA update process. Instead, a change
in system ID is relied upon to indicate a change in root of trust.
If a change in System ID is detected, reprovisioning will be forced.

This is not enabled for ATSC devices or L3 devices. For the latter a
change in system ID may occurs without a change in RoT.

Bug: 258361396
Test: GtsMediaTestCases
Change-Id: I6e8b0b2149fc2ed5362a32bb6e869826f5fa8ef7
 2023-04-05 08:30:47 -07:00
Cong Lin
1b5bf5a71a Fix invalid key session id 
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/169871

The default invalid entitled key session id was 0, which in fact could
be a valid value depending on how the key session id is allocated by the
implementation. This can be a possible cause of L3 entitled key session
failure since L3 can recycle a regular oemcrypto session id 0 and
re-assign it to an entitled key session later.

Bug: 264688931
Test: Run GTS media tests

Change-Id: Iae79d08378d61be8a3402f606992765f24298508
 2023-04-05 00:34:40 +00:00
Kyle Zhang
4587659c5a Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev am: 0ab8f029a0 am: 535e6e8832 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22323332

Change-Id: I1d733d8486ba56d7c75a7396eccc9f5341231255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 21:23:28 +00:00
Kyle Zhang
ad573f7993 Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev am: 0ab8f029a0 am: 0676c30cdc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22323332

Change-Id: Ic1ca3cc6521e97f82bdaff5eb7770d03725af409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 21:22:00 +00:00
Kyle Zhang
0676c30cdc Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev am: 0ab8f029a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22323332

Change-Id: Ia9f9d6f8b22f4ef12ada406152e90eb73b254802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 20:55:18 +00:00
Kyle Zhang
535e6e8832 Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev am: 0ab8f029a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22323332

Change-Id: I67c6734ffc86f7633ac05699a744de968aae064a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 20:54:55 +00:00
Kyle Zhang
0ab8f029a0 Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev 2023-04-04 20:12:57 +00:00
Automerger Merge Worker
691311bf4f Merge "Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev am: 6bddc2e43e am: c0d1a40619" 2023-04-03 07:23:28 +00:00
Alex Dale
9c76658558 Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev am: 6bddc2e43e am: c0d1a40619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22356650

Change-Id: I424f1621f5eb8bc53c628d31a682c186f6baf22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 07:23:23 +00:00
Alex Dale
041bee8aff Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev am: 6bddc2e43e am: 2108a21f2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22356650

Change-Id: I1c805c90ed7d574fce88ebd090327643af05a6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 07:23:16 +00:00
Alex Dale
2108a21f2a Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev am: 6bddc2e43e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22356650

Change-Id: Ie3a368d96851245db281660c4e53fddcea63df17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 06:54:17 +00:00
Alex Dale
c0d1a40619 Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev am: 6bddc2e43e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22356650

Change-Id: I54706eb8ee2c501ce0003df0b644f7dbe8abaf73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 06:54:16 +00:00
Alex Dale
6bddc2e43e Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev 2023-04-03 06:25:56 +00:00
Alex Dale
7cc10d5139 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours am: df6e4a468a -s ours am: 9c505c5cb5 -s ours am: e4a811c3c8 -s ours am: 793f4f1ebf -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I7899a07afe6df0a11133b9c1422e435224f286b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 08:19:40 +00:00
Alex Dale
2278a5ae9b [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 2c9865158c -s ours am: 416f924683 -s ours am: 0f7d39c08d -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I617923647f126b3fbf805f071539bf021f385e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 08:11:32 +00:00
Alex Dale
3f47be184c Merge "Added support for additional HDCP levels." into udc-dev am: e5834cb27d am: 34013de37f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22375216

Change-Id: I2b7bb71d7f0d25a0529c7d066ccadd5c5802dc33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 08:08:56 +00:00
Rahul Frias
cd5883193b Address CDM compilation warnings for android am: adf03c92f4 am: 889338d470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22333742

Change-Id: I0f790cd5eaffd8a1a56c1cb30d0e2b698751d142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 08:03:55 +00:00
Alex Dale
793f4f1ebf [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours am: df6e4a468a -s ours am: 9c505c5cb5 -s ours am: e4a811c3c8 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: Ie25f4d6e405e835272b9feeb212fe37b4eddf009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:45:47 +00:00
Alex Dale
f4693c1d33 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours am: df6e4a468a -s ours am: 9c505c5cb5 -s ours am: e4a811c3c8 -s ours am: 2fc1b59ddc -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: Ic3c2eb38c62e5632bb1a94b48f711f4a85f26ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:42:44 +00:00
Alex Dale
59706cd9d6 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 2c9865158c -s ours am: 416f924683 -s ours am: cb49c23e1e -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I524f243c9e038d12bf5d2f2900995eaf57bb731e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:42:30 +00:00
Alex Dale
2fc1b59ddc [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours am: df6e4a468a -s ours am: 9c505c5cb5 -s ours am: e4a811c3c8 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: Ia728f0eab51c2746b95450ac469291fd17a26c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:22:49 +00:00
Alex Dale
cb49c23e1e [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 2c9865158c -s ours am: 416f924683 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I8cf1ded696e9f774b0654419159d1273f36846b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:22:33 +00:00
Alex Dale
e4a811c3c8 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours am: df6e4a468a -s ours am: 9c505c5cb5 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I686a565dc6ba4310625c806334cc951de9672e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:14:32 +00:00
Alex Dale
0f7d39c08d [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 2c9865158c -s ours am: 416f924683 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I592932f5135f538b65df325c94e9bea0a1ea4190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 03:57:24 +00:00
Alex Dale
9c505c5cb5 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours am: df6e4a468a -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I91243774de4d9caf45a1807b9e5701f8260c9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 03:24:52 +00:00
Alex Dale
df6e4a468a [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 3904f05bae -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I2eab3638548fbd99d5c6c07d21a4c74803d7ba76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:56:46 +00:00
Alex Dale
416f924683 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours am: 2c9865158c -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I9896f73e11fa7ba45f117ee7a8623b6bb788db85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:54:14 +00:00
Alex Dale
3904f05bae [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: Iacf2fde2cb6f2af8a71df98a733104a1056c06da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:11:46 +00:00
Alex Dale
2c9865158c [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours am: f585abface -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I55030e7f752106cddf12b03abe1abb4260e808e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 02:10:46 +00:00
Alex Dale
34013de37f Merge "Added support for additional HDCP levels." into udc-dev am: e5834cb27d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22375216

Change-Id: I222f16205d4a2dc531fb94fd52dba085758c3664
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:57:11 +00:00
Alex Dale
7308c65868 Merge "Added support for additional HDCP levels." into udc-dev am: e5834cb27d am: 37f470db46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22375216

Change-Id: I38f103866a671179340a1796f93d617a3e63311c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:55:44 +00:00
Alex Dale
f585abface [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours am: 48ee2ad7d6 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I43fd01d3791ec2013f3228931b02e15a8e4f1869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:38:50 +00:00
Alex Dale
37f470db46 Merge "Added support for additional HDCP levels." into udc-dev am: e5834cb27d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22375216

Change-Id: I46403c0558a63070fe869609a67c3c4f2358652f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:24:29 +00:00
Alex Dale
48ee2ad7d6 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours am: fc6dccb126 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I453ca04a231b4e35ce10276eb8b3ca79a7d11e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 01:14:18 +00:00
Alex Dale
e5834cb27d Merge "Added support for additional HDCP levels." into udc-dev 2023-04-01 00:56:04 +00:00
Alex Dale
fc6dccb126 [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours am: e099962d1f -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I45272ccad7ac19273fd76ca4997c48890af04bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 00:41:50 +00:00
Alex Dale
e099962d1f [automerger skipped] Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e am: ae71d6ecd0 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 491dfe7690 is already in history

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

Change-Id: I25e190f73804d5e1487dd0224bba77b14c2f8e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 00:11:39 +00:00
Alex Dale
ae71d6ecd0 Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev am: fc365ed31e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21778594

Change-Id: I52f0a38cf00d477c7b3937fc50fb881cad57573c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 23:40:17 +00:00