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

7043 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Dale
b458bd0842 Merge "Android CDM: Restored secure stop tests." into udc-dev am: 9d82b224eb am: 3a3bb1ce14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294726

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

Change-Id: I5c3402c631d49035e74010cdb851b1a442f70f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 01:03:01 +00:00
Alex Dale
7cd71fb983 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: Ia11d9365598a223e099155ce468324dadb4f3b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 00:49:19 +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
Rahul Frias
556fcd5f81 Merge changes I44095261,I30829ad7 into udc-dev am: 98543b50cb am: 2489d1e68e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22239717

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

Change-Id: Ia76469df5e8a50d6fc772603526553150c5806d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 19:17:12 +00:00
Alex Dale
e827a6da8a [automerger skipped] Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f am: 18dce87499 -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: If4f49c6361697b16312f5be4f1ca2988a9674421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 17:17:46 +00:00
Alex Dale
18dce87499 Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046

Change-Id: I9653a720ab006450409ba021c695c9d74947ca61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-30 16:24:37 +00:00
Alex Dale
9d82b224eb Merge "Android CDM: Restored secure stop tests." into udc-dev 2023-03-30 06:11:58 +00:00
Rahul Frias
98543b50cb Merge changes I44095261,I30829ad7 into udc-dev 
* changes:
  Dump BCC on failed provisioning request
  Refresh corpus for oemcrypto fuzz tests with modified format
 2023-03-29 23:34:40 +00:00
Alex Dale
e928670c85 Android CDM: Restored secure stop tests. 
[ Semi-revert of http://ag/20183443 ]
[ Merge of http://go/wvgerrit/168898 ]

These tests were removed from Android last quarter; however, they
now need to be restored.  These tests will be removed in Android V.

To help with ambiguity around where the CDM is operating on a single
or set of usage info messages, the variables have been renamed to
propery indicate plurality.

Bug: 263319220
Test: cdm_extended_duration_test
Test: request_license_test
Test: libwvdrmdrmplugin_hal_test
Change-Id: I38b16dd5811069fafaeab5ffc19d0f8a8095f0cf
 2023-03-28 21:26:06 -07:00
Kyle Zhang
88dec34b40 Merge "Integrate apex version info to Widevine CDM property" into udc-dev am: b5ec1ae108 am: 076886fe20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105407

Change-Id: Iddb23772c286768db5248fa15d699bd534256b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:40:43 +00:00
Kyle Zhang
643269b756 Merge "Integrate apex version info to Widevine CDM property" into udc-dev am: b5ec1ae108 am: 430b87c0b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105407

Change-Id: I746689ea70bdb008fe7e1f8a5d9c3a2389be6bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:30:59 +00:00
Kyle Zhang
430b87c0b0 Merge "Integrate apex version info to Widevine CDM property" into udc-dev am: b5ec1ae108 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105407

Change-Id: Id52395bdd3c597fe4dfc50b4fa21e001607b82a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:02:51 +00:00
Kyle Zhang
076886fe20 Merge "Integrate apex version info to Widevine CDM property" into udc-dev am: b5ec1ae108 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105407

Change-Id: I2c16695bc25822abb565fb700afdabf8ab5569f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 23:00:50 +00:00
Kyle Zhang
b5ec1ae108 Merge "Integrate apex version info to Widevine CDM property" into udc-dev 2023-03-28 22:31:45 +00:00
Alex Dale
cdcd860faa Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2 am: 85997c0ac0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: I1e58d14204ffaec6aec4f2614770d877a27950fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:41:31 +00:00
Rahul Frias
b3a57e7375 Dump BCC on failed provisioning request 
[ Merge of http://go/wvgerrit/168357  and http://go/wvgerrit/168177 ]

When we get an error from the provisioning server while
running a test, we should log extra provisioning
information.

Bug: 273990016
Test: GtsMediaTestCases
Change-Id: I44095261e07ae079c632873f254d8e6879bab8c3
 2023-03-28 20:28:57 +00:00
Fred Gylys-Colwell
e51bb19296 Refresh corpus for oemcrypto fuzz tests with modified format 
Merge from Widevine repo of http://go/wvgerrit/165958
and  http://go/wvgerrit/165862

Bug: 275264353
Test: test only code

Change-Id: I30829ad72d58e2233f4cc9963d17cb07314b7720
 2023-03-28 20:28:57 +00:00
Alex Dale
a12d64a257 Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2 am: 0d4909b80d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: I322508da13c3400a8faa9470b9926369549d2e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 20:12:51 +00:00
Alex Dale
0d4909b80d Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: Ic2533872fdcfe0cdb33a59adf2fd49c225cd8c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:44:15 +00:00
Alex Dale
85997c0ac0 Merge "Fixed test and log formatting for CdmResponseType." into udc-dev am: 5ed89d16e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22141214

Change-Id: Ib52efd43666b2624b63e41a352b59937985edde0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:42:41 +00:00
Alex Dale
5ed89d16e2 Merge "Fixed test and log formatting for CdmResponseType." into udc-dev 2023-03-28 19:21:20 +00:00
Cong Lin
637372b6a2 Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd am: 3ace58cdaf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: I527a24edac55f7402b460a1fe66a9f2c45a4fa2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:18:27 +00:00
Jooyung Han
1f774c49df Set min_sdk_version for the Widevine APEX am: a4de7eb9b5 am: 95b76106f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: Ic5bed986a085d7a8c0bf11558b4320ee29d5f798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 19:05:39 +00:00
Cong Lin
0238d0adc8 Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd am: be32be97e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: I831de296514b5b863b9cb8d6fdee88eb990bd54a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 18:49:46 +00:00
Jooyung Han
6c2484518c Set min_sdk_version for the Widevine APEX am: a4de7eb9b5 am: 25833a3cf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: I4b8818ef8dfe4b75b85cd2cd3c0d623485a1d487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 18:42:00 +00:00
Cong Lin
be32be97e9 Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: Ice7e07b02004a428c77485187d1882a8c325431d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 18:28:26 +00:00
Cong Lin
3ace58cdaf Merge "Fix CSR in wv factory upload tool" into udc-dev am: b7280404bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22294062

Change-Id: I887c673683d3e55813d01a0f9a7ad3f6a3c76e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 18:19:58 +00:00
Kyle Zhang
ce1fb4f089 Integrate apex version info to Widevine CDM property 
Bug: 272587114
Test: dumpsys android.hardware.drm.IDrmFactory/widevine -p
Change-Id: Ica99867511391c252b67f40162665380bd2d8740
 2023-03-28 18:14:02 +00:00
Cong Lin
b7280404bd Merge "Fix CSR in wv factory upload tool" into udc-dev 2023-03-28 18:02:05 +00:00
Jooyung Han
25833a3cf6 Set min_sdk_version for the Widevine APEX am: a4de7eb9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: Ie1219f46b4e419d777fa554f28de24916722c22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 17:39:21 +00:00
Jooyung Han
95b76106f3 Set min_sdk_version for the Widevine APEX am: a4de7eb9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22307320

Change-Id: Ia6acded434b5c5b8a1991c2063830545481da971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 17:35:27 +00:00
Jooyung Han
a4de7eb9b5 Set min_sdk_version for the Widevine APEX 
also remove `use_vndk_as_stable: true` to remove dependency to VNDK
libs.

Bug: 251299786
Test: build WV APEX with V and install it on U device
Change-Id: Ie7f7f9b699119478d4b33f95ab9e6ba7f459346c
 2023-03-28 06:57:46 +00:00
Jooyung Han
5c0b508bdc Link dependencies statically am: 81171a7e75 am: 91496be299 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: If4f18199d5f6fd5caf1dc30925b3b11447b88cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 06:19:39 +00:00
Jooyung Han
dc2cbfa975 Link dependencies statically am: 81171a7e75 am: 64845e114e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: I66d3a86cddf9ab6414f8e2c328f2fd35df483254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 06:18:35 +00:00
Jooyung Han
91496be299 Link dependencies statically am: 81171a7e75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: I9651e2bbc54e911885e5cb1955653f4d9e397209
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 05:53:32 +00:00
Jooyung Han
64845e114e Link dependencies statically am: 81171a7e75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22302466

Change-Id: Ie884238ed1477e35e3b80e8fd25253bdc21bf81d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 05:53:17 +00:00
Jooyung Han
81171a7e75 Link dependencies statically 
This reduces the APEX size from 6754304 to 4378624.

Bug: 274818387
Test: m com.google.android.widevine
Test: adb install $OUT/vendor/apex/com.google.android.widevine.apex
Test: adb reboot
Change-Id: Ib31291e5ee35297b9d85120f5eca118ebf10f55f
(cherry picked from commit 78f0b81ece)
 2023-03-27 23:43:17 +00:00
Cong Lin
6db1ae5167 Fix CSR in wv factory upload tool 
Merge of https://widevine-internal-review.googlesource.com/c/cdm/+/169024

The CSR extracted by WV internal BCC extraction tool is missing a
field "unverifiedDeviceInfo". This is required by the RKP's device
uploading tool for the CSR to be accepted.

Also updated the size of the randomly generated challenge from 32 bytes
to 64 bytes, same as what is used by rpk_factory_extraction_tool.

Test: extracted CSR v2 and v3 and dry run uploading
Bug: 275075496
Change-Id: Icc776f810c81ac6589d82935950167925f95f906
 2023-03-27 21:10:03 +00:00
Alex Dale
52bd76e0e2 Fixed test and log formatting for CdmResponseType. 
[ Merge of http://go/wvgerrit/168397 ]

When CdmResponseType (enum) was transformed to CdmResponseType
(struct), the test printers where not updated to print the result
of failed comparisons.  In addition, several logs statements were
updated haphazardly, leaving inconsistencies and potential
compiler-specific behavior.

This CL replaces CdmResponseType std::string operator with a ToString()
method.  This is to make it consistent with Google's C++ style guide
on conversion operators vs methods.  The string conversion function is
now defined in wv_cdm_types.cpp instead of inline in the header file.

The PrintTo function has been implemented along with the other CDM
test printers in test_printers.cpp.

Bug: 273989359
Test: run_x86_64_tests
Test: MediaDrmParameterizedTests on redfin
Test: Forrest drm_compliance
Change-Id: Ibfaa17029046b75b1c8c278f7bd7e04a24379848
 2023-03-27 11:21:45 -07:00
Jooyung Han
d73a9ac608 Merge "Link dependencies statically" 2023-03-27 06:21:36 +00:00
Automerger Merge Worker
4ccde4549a Merge "Remove some names am: bfa8d39a63 am: fc44dc5f8f" 2023-03-27 05:00:47 +00:00
Fred Gylys-Colwell
908a254f82 Remove some names am: bfa8d39a63 am: fc44dc5f8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: I38f671cf20e1f31f98780e598fb0517ce48a38db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-27 05:00:44 +00:00
Fred Gylys-Colwell
7cac6766d3 Remove some names am: bfa8d39a63 am: 4450b67c36 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: Ia80888770b7823a2506f2f210f7024e8fadd4801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-27 05:00:39 +00:00
Fred Gylys-Colwell
4450b67c36 Remove some names am: bfa8d39a63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: Iee7d035c851d9892a8c254c7a4e433730b4adc89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-27 04:34:53 +00:00