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
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
b6486de93e
Address CDM compilation warnings for android am: adf03c92f4 am: 2d425c9cb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22333742
Change-Id: I32c04107eee063f7be0bc277c4fca98929d4d7ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 21:55:21 +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
2d425c9cb0
Address CDM compilation warnings for android am: adf03c92f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22333742
Change-Id: Id1637829616744dc111302333c2b7a9601620b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 21:26:32 +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
bf872208d8
Merge changes I3002f705,If33f0616,Ifb971bf0,If8fc484f,I65a879fb, ... into udc-dev am: 68e1eac8ec am: 09faf28b33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22305945
Change-Id: Ice42eb60bde8ad23588d80d5d818a31c9a8bb9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:48:06 +00:00
Cong Lin
a0abe187b7
Merge "Update Android L3 after CloseSession() fix" into udc-dev am: 779a5413ef am: f443f47087
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22347414
Change-Id: I1405b55d3273546aee9797e54bc51e1ccd2b97f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:46:49 +00:00
Presubmit Automerger Backend
b8c45dd974
[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: 4b32a1661c -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: If9c5fc5d8ce3ea04fef7166bf9aa02f0d2069071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:42:12 +00:00
TreeHugger Robot
fe478be465
Merge "Clean up files no longer needed." into udc-dev am: 467e38f10e am: 2254a3cfb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22351367
Change-Id: I20be1a3f9cc60db07c09e24bbc69c276eb80e43a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:40:18 +00:00
Presubmit Automerger Backend
9eecf23667
[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: 571dda6eea -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: Ia91db47832b63a9c7749b5395808e40d37585dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:35:39 +00:00
Alex Dale
0014973404
[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: 10904b9b71 -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: I99d98f705e8d6b259674cbae0e850bc0cee2c047
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:28:01 +00:00
TreeHugger Robot
8e5e93696a
Merge changes I3002f705,If33f0616,Ifb971bf0,If8fc484f,I65a879fb, ... into udc-dev am: 68e1eac8ec am: 1f8f2619d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22305945
Change-Id: I4ca4dc827377f919beaaa54c6db9af2dfcb55d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:20:33 +00:00
Kyle Zhang
d72be8ac1d
Merge "Drop Widevine Apex release key signed prebuilts" into udc-dev am: 4d94891fab am: f34b83e44c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22342728
Change-Id: I06be97b570d37361e3cb3fd36a3279655d0eb190
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:19:41 +00:00
Cong Lin
3b2494569c
Merge "Update Android L3 after CloseSession() fix" into udc-dev am: 779a5413ef am: c56b233a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22347414
Change-Id: I4f590adf123fd57ff2da5340313df12a8066e936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 04:17:02 +00:00
Presubmit Automerger Backend
bfe5644d6d
[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: 67a2dc4445 -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: I86bec468b62e4ea4c87ceda1cefa828c3d6dc12e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:53:30 +00:00
TreeHugger Robot
fe77e7e128
Merge "Clean up files no longer needed." into udc-dev am: 467e38f10e am: 9de0edbccf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22351367
Change-Id: Id989b0d1c7d286a6907408b843e80d60bb28b6d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:52:03 +00:00
Alex Dale
e818954e2d
[automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -s ours am: e827a6da8a -s ours am: 4880b0cd65 -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: Ifa76ca89fb83e1f89526bcc446722771f62a50ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:51:36 +00:00
Presubmit Automerger Backend
3290d4ad54
[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: c2c53d9c2e -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: I37ad39d29b39d8ac93944c2ebeb409bd05b713fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:50:36 +00:00
Alex Dale
88a0b06b4e
[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: 4ee6c4f130 -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: I28e5436192838bac9651a35a0e426ef5e3f51b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:46:06 +00:00
Kyle Zhang
6631f50b70
Merge "Drop Widevine Apex release key signed prebuilts" into udc-dev am: 4d94891fab am: 52dfe850ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22342728
Change-Id: Ie269fcd02a119d625f5af279326747ffe683de31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:34:26 +00: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
Alex Dale
e59f12afd7
[automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -s ours am: e827a6da8a -s ours am: b93b7a2247 -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: I087ba8760c65d2a2fe9f8e9e15619172b9e7db17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:30:11 +00:00
Alex Dale
b4a1799d98
Merge "Android CDM: Restored secure stop tests." into udc-dev am: 9d82b224eb am: 7cd71fb983
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294726
Change-Id: I00029a67add70d921dbac38a61e5b30cd8876150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-31 03:28:52 +00:00