Robert Shih
6353e693c5
Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352
Change-Id: Ic72533b8f858e36b61586caee345b6f4b866c8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 21:19:40 +00:00
Robert Shih
4edfacc073
Merge "Return apex name for PROPERTY_VENDOR" into udc-dev am: a658e076dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22606352
Change-Id: Iaa9c756eb7a5178e261102c4328e5aa32c547255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-21 20:57:14 +00:00
Alex Dale
1e1f11f5b1
Fixed WV metrics YAML formating.
...
[ Merge of http://go/wvgerrit/171270 ]
The metrics dump tool for the Widevine DRM factory was producing
malformed YAML output. This is compounded by the formatting using
fixed indentation for its output.
Bug: 239462891
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine -m
Test: atest GtsMediaTestCases
Change-Id: I784d107085721ad0dabe94bdab33e9cc073f98e4
2023-04-21 13:32:52 -07:00
Robert Shih
a658e076dc
Merge "Return apex name for PROPERTY_VENDOR" into udc-dev
2023-04-21 19:37:03 +00:00
Kyle Zhang
e362704180
Create different targets for each Widevine apex
...
Bug: 277764729
Change-Id: I7c8599ba55ba75b092b14ddb88553735f02cdaa0
2023-04-21 17:05:38 +00:00
Jooyung Han
71781924e8
Fix prebuilt apexes
...
- Add vendor:true
- Use use_soong_config_var to toggle prebuilt/source_build
Bug: 251299786
Test: SOONG_CONFIG_widevine_module_source_build=false m \
com.google.android.widevine
Change-Id: If835b443a825dcab1ec09aaa21001602e9b53d20
2023-04-21 17:05:11 +00:00
Cong Lin
dbb3775757
Fix spurious wake up in dynamic adapter am: 5ccb147bb8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796
Change-Id: Ic6cee6974f33b2b3fc263c43ba8e82d8cb3ea5ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-20 22:26:59 +00:00
Cong Lin
5ccb147bb8
Fix spurious wake up in dynamic adapter
...
The predicate version of wait_for() to avoid spurious wake up by
checking running_ status.
This is a fix to ag/21439870
Test: build widevine
Bug: 272424659
Bug: 271811708
Change-Id: I446fef8f4c8c58bcd47b885dba50643b3e5e1185
2023-04-20 19:16:19 +00:00
Kyle Zhang
555b381e81
Set drm@latest to widevine service NOT apex
...
Bug: 277761241
Change-Id: I71f8a7e6b6a1c3cce24a8b33e0bb7748bbdd7230
2023-04-20 17:29:54 +00:00
Cong Lin
f8f75c148b
Re-generate Android L3 after zero-initializer fix am: efd05207c8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22653062
Change-Id: I35c7fdeae9978b0cf56d16c2de8b6a6c7379723a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-17 18:36:00 +00:00
Cong Lin
efd05207c8
Re-generate Android L3 after zero-initializer fix
...
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/170631
Original fix:
Array intializer "= {0}" may involve compiler specific behaviors which
can cause haystack hang on arm32 target. Fix is to use memset() instead.
Test: debug build verified on arm32 device
Test: Ran GTS media tests on Pixel 7
Bug: 274637461
Change-Id: I02f5df232934e0c78e259c85e4faf313c01c0b6b
2023-04-14 12:38:49 -07:00
Rahul Frias
9294de2771
Merge "Force a reprovisioning on device renewal" into udc-dev am: 333fe249e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22360386
Change-Id: I45da5b212de4ba8049bf0abc258b7f532f4b4590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-14 06:10:47 +00:00
Rahul Frias
333fe249e4
Merge "Force a reprovisioning on device renewal" into udc-dev
2023-04-14 05:49:14 +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
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
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