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

7209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Fred Gylys-Colwell
fc44dc5f8f Remove some names am: bfa8d39a63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22200007

Change-Id: I01045b5af37d598c67e71426ac4ffdc6047da8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-27 04:34:51 +00:00
Fred Gylys-Colwell
bfa8d39a63 Remove some names 
Merge from Widevine repo of http://go/wvgerrit/168657

Some people who have left were still in OWNERS files and TODOs.

Bug: 274772704
Test: comments only
Change-Id: I583da815586e5ca52316b2e238d1c1bb3a5e919a
 2023-03-27 02:45:01 +00:00
Fred Gylys-Colwell
3beaf0aaf9 Fix logging error type am: ab8c06906a am: 2de79a7ede 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I50170b50d63335041947c5185d165fa13c522593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 22:16:03 +00:00
Fred Gylys-Colwell
c5150faa6e Fix logging error type am: ab8c06906a am: 69d7e27b72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: Ia8f82d0271a4a148aab9c9a2e9b937561ce58bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 22:14:52 +00:00
Fred Gylys-Colwell
2de79a7ede Fix logging error type am: ab8c06906a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I315e84089536f0af41fcea33dee8ece4d2a630e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 21:46:21 +00:00
Fred Gylys-Colwell
69d7e27b72 Fix logging error type am: ab8c06906a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21649733

Change-Id: I6103161495f1b04f5e07c4c70ad96199ab659fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 21:46:11 +00:00
Jooyung Han
78f0b81ece 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
 2023-03-24 15:27:40 +09:00
TreeHugger Robot
75235e430e Merge "Set min_sdk_version for the Widevine APEX" 2023-03-24 01:57:57 +00:00
Fred Gylys-Colwell
ab8c06906a Fix logging error type 
Merge from Widevine repo of http://go/wvgerrit/166942

The error type is no longer an enumeration.

Bug: 271146682

Change-Id: I64f60fde94d1e8a586128a59f1455041622444b6
 2023-03-23 16:23:43 +00:00
Alex Dale
5d792845c2 Avoid null dereference with empty BCC strings. am: ce25b9d44c am: 333150ca8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22162393

Change-Id: I4f98715cdd03bfba2acd98b3de95a6e5d1437c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 01:38:56 +00:00
Alex Dale
dd1ddb9c3f Avoid null dereference with empty BCC strings. am: ce25b9d44c am: ce18c3222d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22162393

Change-Id: I5d559cd52b5c65e288a4428fa12dc697aed999f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 22:57:57 +00:00
Alex Dale
333150ca8b Avoid null dereference with empty BCC strings. am: ce25b9d44c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22162393

Change-Id: I1afa1444f8127ce1567bf61639bf3602dd6270ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 22:22:34 +00:00
Alex Dale
ce18c3222d Avoid null dereference with empty BCC strings. am: ce25b9d44c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22162393

Change-Id: I5b96ada4caece6a0bdde0fb03d2f4354e72a6e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 22:18:18 +00:00
Jooyung Han
673987db21 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-21 15:08:34 +09:00
Alex Dale
ce25b9d44c Avoid null dereference with empty BCC strings. 
[ Merge of http://go/wvgerrit/168482 ]

The function OEMCrypto_GetBootCertificateChain() does not always
provide an additional signature depending on the device.  However, the
CDM would still attempt to dereference the first character in the
additional signature buffer when empty.  This CL changes how the data
pointer to an output string is acquired.  Empty string will instead
pass in a null pointer.

Bug: 272643393
Test: run_prov40_tests
Test: atest GtsMediaTestCases
Change-Id: I10b0a3c7df4fc73272aa701bb01c60672645d4fc
(cherry picked from commit a878e7b98d)
 2023-03-20 20:29:58 +00:00
TreeHugger Robot
f6deb60b77 Merge "Add Widevine lazy apex" into udc-dev am: 4e8c713f8b am: 996cfd0449 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105405

Change-Id: Ia13b79d8a020d2fff9c4a002ee30abb05961365d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 05:30:34 +00:00
TreeHugger Robot
c97e7fa00e Merge "Add Widevine lazy apex" into udc-dev am: 4e8c713f8b am: 00bac2ca3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105405

Change-Id: Iab632b4d58ae7ef87ea5264c389d18d52e001004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 05:26:29 +00:00
TreeHugger Robot
996cfd0449 Merge "Add Widevine lazy apex" into udc-dev am: 4e8c713f8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105405

Change-Id: I6b216c473ef1cc7825a123da89112bbc65420c09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 04:58:09 +00:00
TreeHugger Robot
00bac2ca3a Merge "Add Widevine lazy apex" into udc-dev am: 4e8c713f8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22105405

Change-Id: I46198f8179c58d460a46d635bc7cf62ee7f59998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-18 04:55:44 +00:00
TreeHugger Robot
4e8c713f8b Merge "Add Widevine lazy apex" into udc-dev 2023-03-18 04:02:05 +00:00
Cong Lin
263f274923 Merge "Update Android L3 after entitled key session fix" into udc-dev am: 412e1bfa13 am: 358924fa20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22101165

Change-Id: I6347412f3dbbcc4637c6dbd0acf6b50f236ae376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:09:49 +00:00
Cong Lin
3cfe06898f Merge "Update Android L3 after entitled key session fix" into udc-dev am: 412e1bfa13 am: a3f6cc9206 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22101165

Change-Id: I88a7b01bcf5b54ad1f039c76ff7673e0a1f70335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 20:08:00 +00:00
Cong Lin
a3f6cc9206 Merge "Update Android L3 after entitled key session fix" into udc-dev am: 412e1bfa13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22101165

Change-Id: Ie0518f14ed21865a5be2273d85062f4742a5c977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 19:02:21 +00:00
Cong Lin
358924fa20 Merge "Update Android L3 after entitled key session fix" into udc-dev am: 412e1bfa13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22101165

Change-Id: I68391b76f79306c55cb5f932dcc8bd9176aa8634
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 19:02:12 +00:00
Cong Lin
412e1bfa13 Merge "Update Android L3 after entitled key session fix" into udc-dev 2023-03-16 18:18:09 +00:00
Alex Dale
800ce6c885 Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev am: 7c213563ca am: fbe1429eab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21921282

Change-Id: I4fbf60af54186204ef22c5746241fa4a6a8a0065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 23:08:30 +00:00
Alex Dale
fcef47a28c Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev am: 7c213563ca am: ae70e78471 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21921282

Change-Id: I92de3c5c7149c6bb612c200b0b806a9483d37eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:50:08 +00:00
Alex Dale
fbe1429eab Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev am: 7c213563ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21921282

Change-Id: Ib54ef7e8c3478c82c3e512c8f657cd0a6c7fbe87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:20:35 +00:00
Alex Dale
ae70e78471 Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev am: 7c213563ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21921282

Change-Id: I37df08b5f2a1480baad403c034e5b1b5651dcc9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:19:49 +00:00
Alex Dale
7c213563ca Merge "Add mutex to CdmEngine for use of cert_provisioning_." into udc-dev 2023-03-15 21:34:37 +00:00
Kyle Zhang
2be47ada77 Add Widevine lazy apex 
Bug: 244498309
Test: m com.google.android.widevine.lazy
Change-Id: I226ae922e9ab7817353d3e94d509b9579c6551e1
 2023-03-15 21:02:14 +00:00
TreeHugger Robot
344ce9f4d7 Merge "Add Widevine lazy apex" 2023-03-15 19:21:42 +00:00
Cong Lin
3dd24639b3 Update Android L3 after entitled key session fix 
This is a merge of
https://widevine-internal-review.googlesource.com/c/cdm/+/168143

Original commit message:
Level3_RemoveEntitledKeySession(key_session) can be called when the
entitled key_session is already released by its entitlement session.
Do not return an error if the key_session to be removed is no longer
valid.

Test: run_dynamic_level3, oemcrypto unit tests on Pixel
Test: GTS media tests
Bug: 264688931
Change-Id: If0e0d0db2137c29e1dab4df321cf11ebcad2451f
 2023-03-15 09:52:05 -07:00
Pete Bentley
781f780d84 [automerger skipped] Include hmac.h in test_base.cpp. am: 4247f72e79 am: 965a7f308d am: 5e72605159 -s ours 
am skip reason: Merged-In I0d4b480e47f84f367d1a9547b89811c52073a2fc with SHA-1 4247f72e79 is already in history

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

Change-Id: Ieb7008646a302a7b51502217e22a365f524ec8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:01:39 +00:00
Pete Bentley
aee144006a [automerger skipped] Include hmac.h in test_base.cpp. am: 4247f72e79 am: 965a7f308d am: 7dacf25ae9 -s ours 
am skip reason: Merged-In I0d4b480e47f84f367d1a9547b89811c52073a2fc with SHA-1 c785e91ec3 is already in history

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

Change-Id: I964cc17a446b7531ed8c6886f00f1a87178a885b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 20:00:12 +00:00
Pete Bentley
5e72605159 Include hmac.h in test_base.cpp. am: 4247f72e79 am: 965a7f308d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21985924

Change-Id: Iadfc39b84f45215d889533904c13912e24dc9698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:07:48 +00:00
Pete Bentley
7dacf25ae9 Include hmac.h in test_base.cpp. am: 4247f72e79 am: 965a7f308d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21985924

Change-Id: Iee1b6d6041450f50b89d796b1938170920c137d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 19:05:23 +00:00