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

6502 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dale
3adda51fc2 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev am: f980049ef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18126088

Change-Id: Ibf810cf6ef434aed8856c5eaa197d52a82168f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 21:10:28 +00:00
Alex Dale
eb1ea89516 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev am: f980049ef0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18126088

Change-Id: Ifef6d4cf3fbf2b7f3e60f43ea85cf47f3042bb3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 21:09:58 +00:00
Alex Dale
f980049ef0 Merge "Resize OEMCrypto buffer-based results on success." into tm-dev 2022-05-05 20:38:05 +00:00
Edwin Wong
ce6c8d55d5 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: 388ea1e988 am: 1d8e7dd80d am: 3bfef29735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I949128bb48f5b81404db3673773f839f602f5781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:44:12 +00:00
Edwin Wong
5f301cd72a Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: e72d16e49f am: edad992f42 am: 7997bf2d1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: If573ca52fa1fccddda0827e68afb56aac6da9bea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:44:05 +00:00
Edwin Wong
b2df95f615 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: e72d16e49f am: 2341ca3ddc am: 6150a59431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: Id3bdd256d9e5a7c0dd806e4cfe163ef13f4770db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:43:56 +00:00
Edwin Wong
3bfef29735 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: 388ea1e988 am: 1d8e7dd80d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I02bf55653e2245ccfbfd0560a2e810839edf55a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:28:22 +00:00
Edwin Wong
7997bf2d1a Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: e72d16e49f am: edad992f42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I16adf684eeacf1530e74b607ba7c0d0fe0723bb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:27:38 +00:00
Edwin Wong
6150a59431 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: e72d16e49f am: 2341ca3ddc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I87442f7f8586322957c30b678455806f4b81eb29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:26:52 +00:00
Edwin Wong
2b41c881f2 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: 421e7d99d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I3874c09e4652c0222a342855199ac343837a91ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:21:03 +00:00
Edwin Wong
2341ca3ddc Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: e72d16e49f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I637ac35f1ac3748a52a40b0cddb35d2a2f152318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:50:05 +00:00
Edwin Wong
1d8e7dd80d Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: 388ea1e988 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I890f6acee1721ae42a7ae7d2f7acd7e86abfd621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:50:01 +00:00
Edwin Wong
edad992f42 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 am: e72d16e49f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I33215173280f8dd3291b3700a0c1d3e380aa78de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:49:36 +00:00
Edwin Wong
e72d16e49f Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I8de18718e7dffdabc660223bf61b44f2780e62ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:23:20 +00:00
Edwin Wong
388ea1e988 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: Iaea267d837a01a39ee5da93b2c0d69b1cc94ea4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:21:33 +00:00
Edwin Wong
421e7d99d9 Merge "Only use libbinder_ndk for aidl service." into tm-dev am: f607802265 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18092491

Change-Id: I4f07440feead6d352fdc2ca378c682b5698501c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 18:21:31 +00:00
Edwin Wong
f607802265 Merge "Only use libbinder_ndk for aidl service." into tm-dev 2022-05-05 17:53:05 +00:00
Cong Lin
5c38855471 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: 2bc51795c9 am: e2c6ceec3c am: 9c76e72454 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I836edd32ee0e09eca3cb64f5efd056bdac6d228a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 17:39:38 +00:00
Cong Lin
39623c29e9 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: c23c689c0a am: 209fd5bac3 am: 469246a2c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: Idc5a06aa72be066a9ac1e412a06a4429b428bc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 17:39:24 +00:00
Cong Lin
25baa34dc8 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: c23c689c0a am: 404ff82954 am: 3231cd946f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I8a8f10d43ec0130892bac90692ecf5cacde558a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 17:39:17 +00:00
Cong Lin
9c76e72454 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: 2bc51795c9 am: e2c6ceec3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I835575edf500a7e9913e31ed5e2fb9fed3056f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 16:53:10 +00:00
Cong Lin
469246a2c5 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: c23c689c0a am: 209fd5bac3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I0bc22c3dbc791581afa98d2bfa988aadd16c849c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 16:52:00 +00:00
Cong Lin
3231cd946f Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: c23c689c0a am: 404ff82954 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I94b46f09c90a2c1edccc608dfc52406248d146ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 16:51:44 +00:00
Cong Lin
51b9001218 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: fa90d3da1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I7839f22385c0d6cf25338dc6649b5eafbfdbfed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 16:26:26 +00:00
Cong Lin
e2c6ceec3c Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: 2bc51795c9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I27e50e059191569aac92e1fc3c2b271c19acd681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:43:28 +00:00
Cong Lin
209fd5bac3 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: c23c689c0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: Ic25f6e9a6db42545daf97771b3cfeaf11d29acfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:42:21 +00:00
Cong Lin
404ff82954 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b am: c23c689c0a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: Iec4c18d799d9e571e38a307cf9feefb6e7e64688
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:42:18 +00:00
Cong Lin
c23c689c0a Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: Iab06782791e7761188a04970ece4fb5da155990e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:18:45 +00:00
Cong Lin
fa90d3da1f Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I7a8479af3c9108da9b9ccecdbdcf244b76c86bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:17:35 +00:00
Cong Lin
2bc51795c9 Merge "Include SPOID in provisioning 4 request" into tm-dev am: e06c526d3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18014492

Change-Id: I6a5b61051507751917a30974b204c05aeef53635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:17:21 +00:00
Edwin Wong
af5f57a46c Only use libbinder_ndk for aidl service. 
[ Merged from http://go/wvgerrit/151169 ]

Test: Netflix and Google TV streaming and downloaded playback
Test: unit tests
Test: atest VtsAidlHalDrmTargetTest
Test: adb shell readelf -d /vendor/bin/hw/android.hardware.drm-service.widevine
Test: adb shell readelf -d /vendor/lib64/libwvaidl.so

Bug: 230791937
Change-Id: Ia60d9fc838bf228b40d99b076a837ae789fa2d03
 2022-05-05 15:12:55 +00:00
Cong Lin
e06c526d3b Merge "Include SPOID in provisioning 4 request" into tm-dev 2022-05-05 14:56:01 +00:00
Alex Dale
1069ae39cc Resize OEMCrypto buffer-based results on success. 
[ Merge of http://go/wvgerrit/151191 ]

Within the CDM and OEMCrypto tests, there were a few OEMCrypto function
calls where the final size of the output buffers were not being
resized.  For several of these functions, an initial call is made with
zero-length output buffers, expecting OEMCrypto to return
ERROR_SHORT_BUFFER; followed by a call with buffers at least as large
as specified by OEMCrypto.  However, for some operations, OEMCrypto
makes an estimate on the final size on the first call, specifying the
exact size only after performing the operations.

This is the case for the wrapped key returned by
OEMCrypto_LoadProvisioning().  The provisioning response contains a
padded + encrypted DRM key.  OEMCrypto does not know the actual size
of the key until decrypted, and the actual DRM key might be smaller.

There was a OEMCrypto test for OEMCrypto_BuildInformation() which
was enforcing the wrong behaviour.  This has been updated.

Bug: 230661565
Test: oemcrypto_test
Change-Id: Iad297d56ffbb085894641fdf8698ce5fd18edbf2
 2022-05-04 21:32:08 -07:00
Vicky Min
94a49d37ef Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 am: ab3ee4d73c am: 69e917dc7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I205f65c0a74d26de90a956c8a146f9a85aecdd60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:31:19 +00:00
Vicky Min
d1e988c668 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: 9c122a40ea am: edcd9fe9f1 am: 55ce026a86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: Id7ede50378bac61be6cd3e76e6e0386309d0191b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:30:52 +00:00
Vicky Min
f97d173d79 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 am: 788614559b am: a0f6b925ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I3f7e0c01ca9af6382b5e23870d669925b4823701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:29:58 +00:00
Vicky Min
69e917dc7e Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 am: ab3ee4d73c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I3915b9b336b87ccfc4e70303b73a4ea6bba05ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:56:47 +00:00
Vicky Min
55ce026a86 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: 9c122a40ea am: edcd9fe9f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8614f5b491d2511a0b74705417097f9d2da8442f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:56:41 +00:00
Vicky Min
a0f6b925ac Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 am: 788614559b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I1e63f4b32d820799b72c85c032ecb0f447bf5907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:56:30 +00:00
Vicky Min
788614559b Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I1024b14f78693474e3884390ba8818f3e3a5429f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:12 +00:00
Vicky Min
ab3ee4d73c Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: ad7a07b234 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I9228c47fe7d301029bc17aa2f8f5f00e0cad0376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:09 +00:00
Vicky Min
edcd9fe9f1 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: 9c122a40ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I05d17d0d374871c5d9dbb81cc60954cb1c771186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:35:00 +00:00
Vicky Min
b52c3b941b Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 am: 6b273fb5e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I1a1d9443b5c99945c3adf8311ca0337549378a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:34:41 +00:00
Vicky Min
ad7a07b234 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8632a274c3ca239b4342a639d3566214a54dd689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:10:57 +00:00
Vicky Min
6b273fb5e0 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I89b5a42e853fa1b88cc4d331fc11db634a8eb4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:10:05 +00:00
Vicky Min
9c122a40ea Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() am: 1563fb2a27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18151647

Change-Id: I8de55fc7626dec605b18b5ccc1de1d51c65efed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 15:09:39 +00:00
TreeHugger Robot
b6cb5024cc Merge "Skip key padding better" 2022-05-04 00:19:06 +00:00
Vicky Min
1563fb2a27 Fix TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths() 
In TestLoadLicenseForOutOfRangeSubStringOffSetAndLengths(),
LoadResponse() should be called after EncryptAndSignResponse() so this
is moved in this CL.

Bug: 231368221
Test: OEMCryptoMemoryLoadLicense tests
Change-Id: I7a0224afb21c3ab1d896ce3cfb64e1ad544a581a
 2022-05-03 23:36:05 +00:00
Fred Gylys-Colwell
2899924d42 Update TestMaxDRMKeys to use 2048 bit keys only 
Merge from Widevine repo of http://go/wvgerrit/151254

Test: Ran tests on reference oemcrypto
Bug: 228996670
Change-Id: I6ea69bad49fa2d4272fc8bb02895c17f314c7f49
 2022-05-02 17:36:36 -07:00
Fred Gylys-Colwell
0d6fbb2d0e Restrict CAS unit tests to devices that support CAS 
Merge from Widevine repo of http://go/wvgerrit/151253

This updates the OEMCrypto unit test filters to remove
CasOnly tests if the device does not implement the cas
function OEMCrypto_LoadCasECMKeys.

Test: unit tests on Luci
Bug: 221256887
Change-Id: I7026c4318153ada1d85055704e87b2cef397ffca
 2022-05-02 15:41:52 -07:00