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

7189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
3781dfbeff Merge "Fix spurious wake up in dynamic adapter am: 5ccb147bb8 am: dbb3775757" 2023-04-20 23:05:16 +00:00
Cong Lin
0b70d8bd45 Fix spurious wake up in dynamic adapter am: 5ccb147bb8 am: dbb3775757 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: Iafbda7d19396a6afebfb198ea2199dc290c02a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 23:05:13 +00:00
Cong Lin
36a07f8686 Fix spurious wake up in dynamic adapter am: 5ccb147bb8 am: 6f9245c7ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: I773cfe69e1cd3aa5e63aeb2d957ecfd06afb70bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 23:05:07 +00:00
Cong Lin
6f9245c7ff Fix spurious wake up in dynamic adapter am: 5ccb147bb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: I13739218a8050fa2ec04ec52848e9dd96e712fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 22:27:02 +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
Treehugger Robot
f97e8dd55d Merge "fix widevine fuzzer: c++_static and cc_fuzz" 2023-04-18 00:56:41 +00:00
Cong Lin
3e44db9d56 Re-generate Android L3 after zero-initializer fix am: efd05207c8 am: f8f75c148b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22653062

Change-Id: Id094ba186fad513c448b85fdfb346cc151d3fc43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 19:03:38 +00:00
Cong Lin
f4f5a32799 Re-generate Android L3 after zero-initializer fix am: efd05207c8 am: 7a70e1baf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22653062

Change-Id: I9c905f15f95683fe406e409834268dd21e5fa5e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:56:02 +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
7a70e1baf6 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: I0628f545d8150cac036d17b63c4beacc08a147ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:15:20 +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
20eba84290 Merge "Force a reprovisioning on device renewal" into udc-dev am: 333fe249e4 am: dbf42e9492 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22360386

Change-Id: I799820ad2eedb328ade82e7d3af83ad1d805c913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 06:41:18 +00:00
Rahul Frias
3c4c7bbd16 Merge "Force a reprovisioning on device renewal" into udc-dev am: 333fe249e4 am: 9294de2771 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22360386

Change-Id: I75abd460742ae8b61dfb24e99f468b34eecc1456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 06:40:50 +00:00
Rahul Frias
dbf42e9492 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: I264e34cc935d8df45f19c06aa349a88c00b7e4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-14 06:10:51 +00: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
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
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