TreeHugger Robot
0bce7db223
Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6 am: 57ea6e5985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819
Change-Id: If5013b9db92b4c088571891d0a2b55b4f614ea58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:37:51 +00:00
TreeHugger Robot
13381a24ba
Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9 am: cae6ea8d7a am: c623b0f98c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971
Change-Id: Id42809b4840edd11718e54f037f438a5ff9b300c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:30:33 +00:00
TreeHugger Robot
1055f995d3
Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9 am: 699e4255b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971
Change-Id: I701d069da5a721e9f48bfb28c79d1d70bac76a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 17:23:33 +00:00
TreeHugger Robot
3878c1370e
Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6 am: a815dd2852
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819
Change-Id: I67aad683dd17f2b3652dc025ab199e03555cda3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:59:27 +00:00
TreeHugger Robot
c623b0f98c
Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9 am: cae6ea8d7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971
Change-Id: I60ed0b524ea279f577ed1c2f616dc10a74517283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 16:20:58 +00:00
TreeHugger Robot
a815dd2852
Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819
Change-Id: If40ae4258575ee82fc898487607bbd565e703135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:49:33 +00:00
TreeHugger Robot
cae6ea8d7a
Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971
Change-Id: If98c5abbba11419ba24b9b11a5a86017d6cd6ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:22:52 +00:00
TreeHugger Robot
76d4139f83
Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6 am: 57ea6e5985
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819
Change-Id: I9aab47ba7cf2244fdc43893408d096724f37b08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:18:41 +00:00
TreeHugger Robot
489e04277f
Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9 am: 699e4255b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971
Change-Id: I241956fb9a0660108f0789c1477bab42a276f3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:12:49 +00:00
TreeHugger Robot
57ea6e5985
Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev am: c4a2a08ee6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18132819
Change-Id: I3e6086f2081d3a1a19a3cf9f9582012b3de8d094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:25:18 +00:00
TreeHugger Robot
699e4255b9
Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev am: 6e4cf1f1a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18128971
Change-Id: Iad7c2038d6045ebfa1a49c9a5517e865caa86da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 14:21:48 +00:00
TreeHugger Robot
c4a2a08ee6
Merge "Update TestMaxDRMKeys to use 2048 bit keys only" into tm-dev
2022-05-09 09:34:58 +00:00
TreeHugger Robot
6e4cf1f1a9
Merge "Restrict CAS unit tests to devices that support CAS" into tm-dev
2022-05-09 09:34:55 +00:00
Rahul Frias
6290d69d3c
Merge "Check L3 for secure stops" into tm-dev am: f4e2e9833d am: 5dd27bc39b am: 98bdec95f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18192750
Change-Id: If26c055bf73ba984fe23b4f6d7c6147b97d6d3a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 23:13:50 +00:00
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