Commit Graph

6328 Commits

Author SHA1 Message Date
Rahul Frias
9329a98790 Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: bece59a04c am: 9f7de32d0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: I541e29460f8a987f2dc4793c37fef656d3323180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:13:30 +00:00
Automerger Merge Worker
2e82692bb1 Merge "Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: 90a51d34fb am: 2fb25bc609" into tm-qpr-dev-plus-aosp 2022-05-06 23:13:04 +00:00
Rahul Frias
67a91d350e Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: bece59a04c am: 47a8318852
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: I4e8b96862583502f69734c5ab303f9a105704421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:13:00 +00:00
Rahul Frias
d07a12de7d Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: 90a51d34fb am: 2fb25bc609
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: I63f49ca09f0d9c35317be1e71cf1beb1b3bc551b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:13:00 +00:00
Rahul Frias
c4aac14ba9 Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: bacd3dd9d3 am: 90088202fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: Ic86bc2d9edcee2903a565f01b72f674151d388e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:12:16 +00:00
Rahul Frias
f68381bf65 Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: bacd3dd9d3 am: f39815c3cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: Id20ab36459fbb439651cc70653bb3d73405a433e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 23:12:00 +00:00
Rahul Frias
98bdec95f7 Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: 5dd27bc39b
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: Icba6ff32acfe93790dba8f65eb2d841c8f5499c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:46:02 +00:00
Rahul Frias
9f7de32d0e Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: bece59a04c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: I968475e286af42e8e8cff320bbcf4a00b27a5f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:45:10 +00:00
Rahul Frias
47a8318852 Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: bece59a04c
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: I2f6e807199ae318adca4e3f80c09e8e383739514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:45:07 +00:00
Rahul Frias
2fb25bc609 Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: 90a51d34fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: Ic97fc32434b53d9a91bfdccfc3d5fcfd4fae86c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:44:53 +00:00
Rahul Frias
f39815c3cc Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: bacd3dd9d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: Ic59bc26709ae7dcc9fec84832378951d4ddebf76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:44:50 +00:00
Rahul Frias
90088202fb Merge "Update version change canary test" into tm-dev am: e26370f0b6 am: bacd3dd9d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: I03f2f8ed4536370d8d3b6f5d7d80beef13948b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:44:37 +00:00
Rahul Frias
bece59a04c Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: I15d2b1d134cdd8f6823d001d060c7b2d7247e8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:27:28 +00:00
Rahul Frias
bacd3dd9d3 Merge "Update version change canary test" into tm-dev am: e26370f0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: I8a63cdbe0f3357588f2ad6dc7793a7895b7bc4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:27:09 +00:00
Rahul Frias
5dd27bc39b Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750

Change-Id: I747c796868628c614db0e9ab2076d0d6abb16c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:26:16 +00:00
Rahul Frias
90a51d34fb Merge "Update version change canary test" into tm-dev am: e26370f0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18194076

Change-Id: I865cdfa8815549eeabcdd98f85c856cd899b5561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 22:25:54 +00:00
Rahul Frias
f4e2e9833d Merge "Check L3 for secure stops" into tm-dev 2022-05-06 22:08:52 +00:00
Rahul Frias
e26370f0b6 Merge "Update version change canary test" into tm-dev 2022-05-06 22:06:05 +00:00
Edwin Wong
19407fdc10 Add libwvdrmmediacrypto_hal_test for AIDL service.
[ Merge from http://go/wvgerrit/151349 ]

- move plugin and mCdm creation in SetUp() test fixture
- replace StrictMock<MockCD<> with NiceMock; otherwise,
  "uninteresting mock for isOpenSession" will return fail by default
- replace .WillOnce() for isOpenSession() with .WillRepeatedly

Test: m libwvdrmmediacrypto_hal_test -j128
Test: m libwvdrmmediacrypto_hal_test  WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/libwvdrmmediacrypto_hal_test  /data/nativetest/.
Test: adb shell  LD_LIBRARY_PATH=/vendor/lib64
/data/nativetest/libwvdrmmediacrypto_hal_test

Bug: 217247987
Change-Id: I8d7189473d52738645c73c6665f4f3f6a13042f0
2022-05-06 18:21:57 +00:00
Robert Shih
05878ffbe1 wv_factory_extraction_tool: extract provision 4.0 csr
Bug: 231677822
Test: adb shell wv_factory_extraction_tool csr
Change-Id: I9f21514b027261f1d69c24a4d2f54051ccaac9a5
2022-05-06 01:40:11 -07:00
Rahul Frias
13daf6d3ed Check L3 for secure stops
[ Merge of http://go/wvgerrit/151512 ]

Parameterizing GtsMediaDrm tests exposed a few issues. If secure stops
were stored at L3 security level, retrieval would fail. This CL
checks L3 if the secure stop was not found at the default security
level.

Bug: 221249079
Test: GtsMediaTestCases
Change-Id: Ie88197f8e29457981d782199a76d38774f6faa67
2022-05-06 01:39:24 +00:00
Rahul Frias
81e5fc3dc4 Update version change canary test
[ Merge of http://go/wvgerrit/151571 ]

The android OS version has been updated to 13. Updating WV tests as well.
CDM version has been updated previously, so no additional changes are needed.

Bug: 231646284
Test: WV unit/integration tests
Change-Id: Ifaf2fe1f04627654725b1b221d8c3dc30029ac6c
2022-05-05 18:29:25 -07:00
Alex Dale
11c20676ec Merge "Resize OEMCrypto buffer-based results on success." into tm-dev am: f980049ef0 am: eb1ea89516 am: a7e4321f63
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18126088

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

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

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

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

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

Change-Id: Ifef8e49a3a40135afea2fe43906dc9d04a671010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:28:45 +00:00
Alex Dale
541f6a38c2 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: I624bf91717b136353c03f6e628021a3eaa3ac91d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:11:49 +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
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
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
f607802265 Merge "Only use libbinder_ndk for aidl service." into tm-dev 2022-05-05 17:53:05 +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
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
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