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
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
Pete Bentley
965a7f308d Include hmac.h in test_base.cpp. am: 4247f72e79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21985924

Change-Id: I83c97a129c52454782e9d1641ec3fec5c36fb568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-13 18:31:19 +00:00
Pete Bentley
4247f72e79 Include hmac.h in test_base.cpp. 
Cherry-pick note: Compile fix only, needed for latest AOSP BoringSSL in tm-qpr-dev-plus-aosp and downstream branches, e.g. udc-*-dev.

Original change description:
Include what you use - this is no longer pulled in
by the other headers used in this file.

Bug: 272749540
Test: m
Change-Id: I0d4b480e47f84f367d1a9547b89811c52073a2fc
Merged-In: I0d4b480e47f84f367d1a9547b89811c52073a2fc
(cherry picked from commit c785e91ec3)
 2023-03-13 10:44:08 +00:00
Pete Bentley
c785e91ec3 Include hmac.h in test_base.cpp. 
Include what you use - this is no longer pulled in
by the other headers used in this file.

Bug: 272749540
Test: m
Change-Id: I0d4b480e47f84f367d1a9547b89811c52073a2fc
 2023-03-11 12:21:01 +00:00
Kyle Zhang
24e7d20c2e Add Widevine lazy apex 
Bug: 244498309
Test: m com.google.android.widevine.lazy
Change-Id: I226ae922e9ab7817353d3e94d509b9579c6551e1
 2023-03-10 23:43:02 +00:00
TreeHugger Robot
74be14065e Merge "Adding ApexInfo utility" into udc-dev am: cb0d5e24be am: 8928214a06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21702626

Change-Id: I3ec482fe0a21a33ce30dfbe466a1e54365d8aa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:28:25 +00:00
TreeHugger Robot
3ec5586569 Merge "Adding ApexInfo utility" into udc-dev am: cb0d5e24be am: 6bcd6d2de7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21702626

Change-Id: Idc942ebed21dda375461f77d02051f0a54d71dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:27:29 +00:00
TreeHugger Robot
8928214a06 Merge "Adding ApexInfo utility" into udc-dev am: cb0d5e24be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21702626

Change-Id: I7dd39c8924e5455f365d47bbb619e098acec8de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:01:46 +00:00
TreeHugger Robot
6bcd6d2de7 Merge "Adding ApexInfo utility" into udc-dev am: cb0d5e24be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21702626

Change-Id: I92d217e9213790463f69464403aabd76e511ad43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-10 07:01:29 +00:00
TreeHugger Robot
cb0d5e24be Merge "Adding ApexInfo utility" into udc-dev 2023-03-10 06:11:13 +00:00
Cong Lin
eae65e8aef Merge "Revert "Update to handle spurious wake up in conditional variable"" 2023-03-10 01:29:49 +00:00
Cong Lin
646a1eece5 Revert "Update to handle spurious wake up in conditional variable" 
This reverts commit 75eef5c3a3.

Reason for revert: Temporarily revert this because of b/272424659, b/259697096, while we are discussing another fix ag/21942341

Change-Id: Ib6a7e9cbede2a818433e67315affc60607146d55
 2023-03-09 23:58:38 +00:00
Alex Dale
6e5ab021d8 Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167618 ]
[ PoC http://ag/21922303 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-09 14:01:40 -08:00
Presubmit Automerger Backend
0aef7b0dd2 [automerge] Add mutex to CdmEngine for use of cert_provisioning_. 2p: 491dfe7690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21892284

Bug: 258188673
Change-Id: Id1ee612fa3efa0d9c001dba00d76ed137d1f9594
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-09 04:21:32 +00:00
Alex Dale
48bfaab32f Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167529 ]
[ PoC http://ag/21900113 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-08 20:19:44 -08:00
Alex Dale
491dfe7690 Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167500 ]
[ PoC http://ag/21891126 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-08 20:18:00 -08:00
Alex Dale
7129e9c7ec Add mutex to CdmEngine for use of cert_provisioning_. 
[ Merge of http://go/wvgerrit/167337 ]
[ PoC http://ag/21737796 ]

Bug: 258188673
Test: sts-tradefed run sts-dynamic-develop -m StsHostTestCases \
    -t android.security.sts.Bug_258188673
Test: GtsMediaTestCases
Change-Id: If71a0e7a81f376cf28688a590b6cb9dcea699545
Merged-In: If71a0e7a81f376cf28688a590b6cb9dcea699545
 2023-03-08 20:15:15 -08:00
Robert Shih
6a819cd50c Compact aidl exception message am: 3c9cbc6cbe am: 1c89cb3f1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21874559

Change-Id: I7604396c15fb0d06464bda65398b8672e7a405b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 06:43:27 +00:00
Robert Shih
50f3c10e23 Compact aidl exception message am: 3c9cbc6cbe am: 69fa06c614 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21874559

Change-Id: I71f73b8e0d421a7c0e82d30e2076c3a8671c17d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 06:40:01 +00:00
Robert Shih
69fa06c614 Compact aidl exception message am: 3c9cbc6cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21874559

Change-Id: Ia4bf88b55beb4b1889aad66a284bc513ecdc8d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 06:07:59 +00:00
Robert Shih
1c89cb3f1b Compact aidl exception message am: 3c9cbc6cbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21874559

Change-Id: I29c9974f3a77433bed9a942137dec6c66f06b49a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-08 06:05:20 +00:00