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

7172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
0ab8f029a0 Merge "Drop Widevine CDM v17 prebuilt files" into udc-dev 2023-04-04 20:12:57 +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
6bddc2e43e Merge "Add mutex to CdmEngine for use of usage_session_." into udc-dev 2023-04-03 06:25:56 +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
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
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
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
Alex Dale
fc365ed31e Merge "Add mutex to CdmEngine for use of cert_provisioning_." into rvc-dev 2023-03-31 23:16:37 +00:00
Rahul Frias
889338d470 Address CDM compilation warnings for android am: adf03c92f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22333742

Change-Id: I78a08a80b18dbdb3b9058251fba36e1697101bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 21:30:55 +00:00
Rahul Frias
adf03c92f4 Address CDM compilation warnings for android 
[ Merge of http://go/wvgerrit/169230 ]

Bug: 275675184
Test: Compile and GtsMediaTestCases
Change-Id: I3dc01f383a1fae07c126782e8d3561ab724316a8
 2023-03-31 11:46:28 -07:00
Alex Dale
6cbd75bb6c Added support for additional HDCP levels. 
[ Merge of http://go/wvgerrit/169450 ]

OEMCrypto v17 introduced several new HDCP levels that OEMCrypto may
report; however, the CDM never updated to support them.  The enum
values of the additional levels are no longer sequential with their
level of support (v1.1 is 7, and v2.1 is 3), this requires more
considerations when comparing the required HDCP levels (as specified
by the license) and current HDCP level supported by OEMCrypto.

The following rules were used:
1) HDCP_NONE is the absolute lowest level
2) HDCP_NO_DIGITAL_OUTPUT is the absolute highest level
3) HDCP_V1 is treated as equal to all V1.x levels
4) All other versions are based on their major-minor pairs

Bug: 269671291
Test: license_unittest
Test: policy_engine_constraints_unittest
Test: policy_engine_unittest
Test: GtsMediaTestCases
Change-Id: Ibecfcb981d7e019c68cb8e0c7286222253d18369
 2023-03-30 23:33:25 -07:00
TreeHugger Robot
1f8f2619d5 Merge changes I3002f705,If33f0616,Ifb971bf0,If8fc484f,I65a879fb, ... into udc-dev am: 68e1eac8ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22305945

Change-Id: I6b15e4d0932b9d3978c88eaa0e0ed1d06aaed72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 03:33:18 +00:00
TreeHugger Robot
68e1eac8ec Merge changes I3002f705,If33f0616,Ifb971bf0,If8fc484f,I65a879fb, ... into udc-dev 
* changes:
  Filter RSA 3072  tests
  Add MemorySanitizer support for opk_ta tests
  Filter CAS tests
  Refactor missed provisioning and renewal tests
  Use GTEST_SKIP to skip prov40 tests
  Update test updates and known issues to ChangeLog
  Update oemcrypto unit tests version number
  Update CHANGELOG for late-breaking OPK v17.1.1 changes
  Filter Cast Reciver tests
  Document RSA keypair issue on OP-TEE 64-bit
  Use GTEST_SKIP to skip prov 3.0 tests
  Remove V17 backwards-compatibility decrypt functions
  Small changes to refactored unit tests
  Add CHANGELOG entry for OPK v17.1.1
  Refactor usage table tests
  Refactor decrypt unit tests
  Update OPK v18 documentation
  Fix null passed to memcpy in generic verify fuzz
  Update documentation for Cast
  Document lacking signature of Prov 3.0 message
 2023-03-31 02:13:24 +00:00
Cong Lin
c56b233a92 Merge "Update Android L3 after CloseSession() fix" into udc-dev am: 779a5413ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22347414

Change-Id: I7a6cb9ab47679ef47ba1f40b4a5f9ceba2af7e4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:59:41 +00:00
Cong Lin
779a5413ef Merge "Update Android L3 after CloseSession() fix" into udc-dev 2023-03-31 01:30:38 +00:00
Presubmit Automerger Backend
67a2dc4445 [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours am: fb319ba5dc -s ours am: 5d89b131a5 -s ours am: ad346225e9 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I6a975d5281dd3b99c65e3f230525ab26e4495bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:29:27 +00:00
TreeHugger Robot
9de0edbccf Merge "Clean up files no longer needed." into udc-dev am: 467e38f10e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22351367

Change-Id: Id6dcb52420b35e07daee5714b840978c91c7b5fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:20:10 +00:00
Presubmit Automerger Backend
c2c53d9c2e [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: b490501324 -s ours am: f1272a7e35 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I8536669e6a4374a8fe52f4400f1b4da66392bdb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:12:54 +00:00
Alex Dale
4ee6c4f130 [automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37 am: a54e3a924e am: 300491060f -s ours am: 6baaafc851 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I9daec58a1c67c0dcae62010d4d4d5eccf4a73cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:02:32 +00:00
Kyle Zhang
52dfe850ad Merge "Drop Widevine Apex release key signed prebuilts" into udc-dev am: 4d94891fab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22342728

Change-Id: I98bb4a215e5dda0e23c84fc12f53c18f99fb24ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:53:00 +00:00
Alex Dale
b93b7a2247 [automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -s ours am: e827a6da8a -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 6e5ab021d8 is already in history

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

Change-Id: Iefc27a178391d0f600fdc168282736ac59d010da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:46:52 +00:00
Alex Dale
3a3bb1ce14 Merge "Android CDM: Restored secure stop tests." into udc-dev am: 9d82b224eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294726

Change-Id: I02a9749a4059a12e81d10a471c8141c2e8d5140a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:34:52 +00:00
Rahul Frias
4f11544afc Merge changes I44095261,I30829ad7 into udc-dev am: 98543b50cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22239717

Change-Id: I608af2dd4de640d563d6a1f388748ce28a86ea14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 23:23:20 +00:00
Kyle Zhang
a053a34e13 Drop Widevine CDM v17 prebuilt files 
The following files have been updated as part of this change:

libwvdrmengine/prebuilt/v17/android.hardware.drm-service.widevine

Built here: ab/P53529894


The change is generated with prebuilt drop tool.

Bug: 274815205
Change-Id: I9acb9b4ce62548763f9345b645221c5bea0d3b21
 2023-03-30 22:01:26 +00:00
Presubmit Automerger Backend
ad346225e9 [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours am: fb319ba5dc -s ours am: 5d89b131a5 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I0c6bd0ef9efa73d3123ed5c5f778c79da3ba58d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 21:55:07 +00:00
TreeHugger Robot
467e38f10e Merge "Clean up files no longer needed." into udc-dev 2023-03-30 21:22:30 +00:00
Presubmit Automerger Backend
5d89b131a5 [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours am: fb319ba5dc -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I82876d7310cb88edbe2f67c61b46692a720f6e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 21:11:39 +00:00
Alex Dale
d66177a257 Add mutex to CdmEngine for use of usage_session_. 
[ Merge of http://go/wvgerrit/169430 ]

Bug: 263314813
Test: GtsMediaTestCases
Test: request_license_test
Change-Id: I0859865d26b14d492832001e55897f89853577f1
 2023-03-30 13:50:34 -07:00
Presubmit Automerger Backend
fb319ba5dc [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: dfe7c493de -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I6fac25c59bfcb90015d669eb825b190c1adc89e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:42:27 +00:00
Presubmit Automerger Backend
f1272a7e35 [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours am: b490501324 -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I914bab13a327019958bc7fb1378af790b15bcb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:39:19 +00:00
Presubmit Automerger Backend
dfe7c493de [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I8bbaea855ec14d368b5e9492c51fbdf49c759bc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:06:43 +00:00
Presubmit Automerger Backend
b490501324 [automerger skipped] [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 am: 0aef7b0dd2 am: 20441c9b5b -s ours am: 263a86047c -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I649d0fb24b0238fb2b0fab1125f34831d0815ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 20:06:04 +00:00
Alex Dale
6baaafc851 [automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 8ef7063d37 am: a54e3a924e am: 300491060f -s ours 
am skip reason: Merged-In If71a0e7a81f376cf28688a590b6cb9dcea699545 with SHA-1 48bfaab32f is already in history

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

Change-Id: I8b28d05c3e11c0bac9a8b841b3b7b4f7e657d7f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:34:18 +00:00