Alex Dale
18dce87499
Add mutex to CdmEngine for use of cert_provisioning_. am: 48bfaab32f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21900046
Change-Id: I9653a720ab006450409ba021c695c9d74947ca61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 16:24:37 +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
Edwin Wong
c28a938337
[automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours am: 4e4f786a0b -s ours
...
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856
Change-Id: I6363ee51de3e60819ce46168cfd28741b033966a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 04:04:20 +00:00
Edwin Wong
4e4f786a0b
[automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours am: c6aebda041 -s ours
...
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856
Change-Id: Ic60d2c5e9224661a6f746461aee846ee38388cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 03:24:00 +00:00
Edwin Wong
c6aebda041
[automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours am: 10c9a1f4e6 -s ours
...
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856
Change-Id: I57cd6e58382b33e77434c746724cef9f0cc84c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 02:49:29 +00:00
Edwin Wong
10c9a1f4e6
[automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours am: b2203809a1 -s ours
...
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856
Change-Id: I506d74ecdd7a9802feec0dc8124d0b9c764bf8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 02:10:24 +00:00
Edwin Wong
b2203809a1
[automerger skipped] Fixed race condition in closeSession am: 97bbc07174 am: 58513d031e -s ours
...
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 08acec9c3a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856
Change-Id: I2b87d3b73337af1b55ed6245e02dd8a302665323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:51:32 +00:00
Edwin Wong
58513d031e
Fixed race condition in closeSession am: 97bbc07174
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20899856
Change-Id: I06263def49d360c37b8103c137a3e2ce95cce733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 01:15:30 +00:00
Presubmit Automerger Backend
353b214db3
[automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours am: 312566b17b -s ours
...
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394
Change-Id: I6b1fb4668bd3b16f7610347096ba59667753e741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 00:42:19 +00:00
Presubmit Automerger Backend
312566b17b
[automerger skipped] Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece am: fab129def9 -s ours
...
am skip reason: Merged-In I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3 with SHA-1 4222daa047 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394
Change-Id: If75c6ac21293ac6efac21ef97e9dc178e16a97a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-07 00:21:43 +00:00
Edwin Wong
0dbe9fdc0d
Fixed race condition in closeSession am: 4222daa047
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/20918774
Change-Id: I17691768be7e04cdf3fefddb1e6dc3a1751a4035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 23:48:16 +00:00
Presubmit Automerger Backend
fab129def9
Fixed race condition in closeSession 2p: 08acec9c3a am: 08771dfece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282394
Change-Id: Id9437ef2c22f04ac37782214a41da52a9a8bf107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 23:48:11 +00:00
Presubmit Automerger Backend
08771dfece
Fixed race condition in closeSession 2p: 08acec9c3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/21282393
Bug: 258189255
Change-Id: I2135835a745d28cc90980cc16405a1c28f64f35c
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
2023-03-06 18:12:05 +00:00
Edwin Wong
4222daa047
Fixed race condition in closeSession
...
Merged from http://go/wvgerrit/165061
poc: http://go/ag/20978750
Fix race that corrupts mCryptoSessions std::map,
and race that occurs when CryptoSessions are used after free.
Test: poc
Test: atest MediaDrmParameterizedTests
Test: atest GtsMediaTestCases
Bug: 258189255
Change-Id: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
2023-03-06 08:00:46 +00:00
Edwin Wong
97bbc07174
Fixed race condition in closeSession
...
Merged from http://go/wvgerrit/165059
poc: http://go/ag/20978761
Fix race that corrupts mCryptoSessions std::map,
and race that occurs when CryptoSessions are used after free.
Test: poc
Test: atest MediaDrmParameterizedTests
Test: atest GtsMediaTestCases
Bug: 258189255
Change-Id: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
2023-02-06 18:29:02 +00:00
Edwin Wong
08acec9c3a
Fixed race condition in closeSession
...
Merged from http://go/wvgerrit/165498
poc: http://go/ag/20978761
Fix race that corrupts mCryptoSessions std::map,
and race that occurs when CryptoSessions are used after free.
Test: poc
Test: atest MediaDrmParameterizedTests
Test: atest GtsMediaTestCases
Bug: 258189255
Change-Id: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
Merged-In: I298d3e0770ace9cd590dfaacaa4c52a0732c2fe3
2023-02-06 18:28:14 +00:00
TreeHugger Robot
b0fe007cc6
Merge "[DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse()" into tm-dev am: 29aa1f3732
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18687130
Change-Id: I0c3dc9b0c0fc93660d1c8cb65182c3e6682b275b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 19:26:02 +00:00
Vicky Min
38c5136b8c
[DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse() am: 0890df5b16
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18687130
Change-Id: I4c1761263198df7392d75097f31810d47242628e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-30 19:26:00 +00:00
TreeHugger Robot
29aa1f3732
Merge "[DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse()" into tm-dev
2022-11-30 18:44:57 +00:00
Vicky Min
0890df5b16
[DO NOT MERGE] Fix out of bounds buffer error in CreateCoreLicenseResponse()
...
In CreateCoreLicenseResponse(), there seems to be an out of bounds
potential error due to a missing check that the index used for
license_response.parsed_license->key_array is valid. Adding a check
for this here.
Bug: 217677571
Test: fuzz tests
Change-Id: I37f7228f87992ba5284c553d7b07ef97d6a66ab3
(cherry picked from commit eb711ea0ec )
2022-11-30 17:27:23 +00:00
Cong Lin
154a1db776
Add unit test for clear KCB in LS SDK 16.4 response am: 8c4c238324
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18973819
Change-Id: I59e227877aee30a0f0d1e755234f1913cf1903c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-18 08:09:35 +00:00
Cong Lin
8c4c238324
Add unit test for clear KCB in LS SDK 16.4 response
...
This is a merge from:
https://widevine-internal-review.googlesource.com/c/cdm/+/152897
and http://go/wvgerrit/153709
Adding a new OEMCrypto unit test will allow partners to correct a
problem earlier in their integration.
Verifies current oemcrypto implementation handles clear KCB in a
mocked 16.4 license response.
Unit test release date updated to 2022-06-17.
Test: run_x86_64_tests; opk_ta
Bug: 235870170
Bug: 234645065
Change-Id: I59fef2c25f5c007624447d4f46147d96adeddad9
2022-06-17 15:02:09 -07:00
Rahul Frias
09a31762a1
Allow provisioning model to be queried am: cd593979e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18624153
Change-Id: Ied2ef9132c5e92149407d1e68091d570d73896ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 04:06:42 +00:00
Rahul Frias
cd593979e9
Allow provisioning model to be queried
...
[ Merge of http://go/wvgerrit/152674 ]
This allows an app to query the provisioning model. Possible
values are { "DrmCertificate", "Keybox", "OEMCertificate",
"BootCertificateChain" }
An app can use these to disntinguish between provisioning models.
Provisioning 4.0 (boot certificate chain) requires a double provisioning
step.
Bug: 234057551
Test: WV unit/integration tests, libwvdrmdrmplugin_hal_test
Change-Id: I1611488ec632a0e5a9e1d106b7475e8f5a2a5a13
2022-05-26 16:22:16 -07:00
Cong Lin
3a4cb0b3da
Loosen KCB encryption checks in L3 am: 9935fae50d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18528965
Change-Id: I51e897abda6993b91b30c19db7c5935764a727d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-22 07:08:56 +00:00
Cong Lin
9935fae50d
Loosen KCB encryption checks in L3
...
This is a merge from:
https://widevine-internal-review.googlesource.com/c/cdm/+/152372
The L3 source change which produced these libraries is:
https://widevine-internal-review.googlesource.com/c/cdm/+/152371/
Original commit message:
To address the bug with certain 16.4.x SDK versions returning a
clear key control block (KCB) for clients newer than 16.5, the
exact version check to determine whether key control blocks are
clear or not has been loosened.
Original behavior:
- ODK version >= 16.5.x --> Assume clear
- ODK version <= 16.4.x --> Assume encrypted
New behavior:
- No KCB IV --> Assume clear
- Otherwise --> Assume encrypted
This CL also includes a change to oemcrypto/include/OEMCryptoCENC.h
The changes to OEMCryptoCENC.h in the CL are comments or variable name
change. So it should be safe.
This change was merged to wv tm-dev here:
https://widevine-internal-review.googlesource.com/c/cdm/+/148411
So, adding it to Android tm-dev.
Test: run_level3_static_tests, CdmDecryptTest/CdmTestWithDecryptParam.* against LS SDK 16.4.2 & 17.0
Bug: 232557453
Change-Id: I2bbb5ab3ea33a16bd6c198077e5aefe960737ea0
2022-05-22 06:35:22 +00:00
Robert Shih
46eb875fcd
Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev am: 186e489562
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17992673
Change-Id: I7fa80dacf1f7dbad0547560e0292563d15564f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-16 07:40:02 +00:00
Robert Shih
186e489562
Merge "dumpsys widevine: print hex IDs to avoid garbled text" into tm-dev
2022-05-16 06:17:33 +00:00
Alex Dale
3c82ad605d
Move system ID extraction outside of CryptoSession. am: 9d169a00bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18244016
Change-Id: I1f82980a08bd0bf4923f9932cabe5c98bd88c4d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-13 18:18:17 +00:00
Alex Dale
9d169a00bb
Move system ID extraction outside of CryptoSession.
...
[ Merge of http://go/wvgerrit/151391 ]
This CL moves the logic for extracting the system ID from keybox or
OEM certificate (from OEMCrypto or device files) to a dedicated
SystemIdExtractor.
Before Provisioning 4.0, the system ID could only be found from data
returned by OEMCrypto. However, with provisioning 4.0, the system ID
can now be found in the OEM certificate that is stored on the device
files.
Bug: 232020319
Test: system_id_extractor_unittest
Test: Forest L37800000954493485
Change-Id: Ie1b7987906e2e4fef015cd659a947b6dbb7594b1
2022-05-12 19:22:03 -07:00
Alex Dale
b3bc24aaf1
Merge "Added metrics for production readiness." into tm-dev am: 8ac7ca3f46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18304422
Change-Id: Icb1244bfa2831f36d63fcdb5db96a9ae17e10b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 23:02:13 +00:00
Alex Dale
8ac7ca3f46
Merge "Added metrics for production readiness." into tm-dev
2022-05-12 22:10:24 +00:00
Edwin Wong
8cc0db4a89
Add hal_metrics_adapter_unittest for AIDL service. am: cf3771e54a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18308868
Change-Id: I6ad4d5573686317a4d1aece16f9136936dbc8faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-12 03:09:34 +00:00
Edwin Wong
cf3771e54a
Add hal_metrics_adapter_unittest for AIDL service.
...
[ Merged from http://go/wvgerrit/151750 ]
Test: m hal_metrics_adapter_unittest -j128
Test: m hal_metrics_adapter_unittest WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/hal_metrics_adapter_unittest /data/nativetest/.
Test: adb shell LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/hal_metrics_adapter_unittest
Bug: 217247987
Change-Id: I0c890d2fab754bf993632659293a0272c863b11f
2022-05-11 22:01:35 +00:00
Edwin
8089519493
Add libwvdrmdrmplugin_hal_test for AIDL service am: 5202862e9a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/17831572
Change-Id: I0d15e53dd83e507f840731f74590c7f6a43103fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 20:19:32 +00:00
Edwin
5202862e9a
Add libwvdrmdrmplugin_hal_test for AIDL service
...
[ Merged from http://go/wvgerrit/150769 ]
- remove OpenSessions_1_1, only applies to hidl
- move plugin and mCdm creation in SetUp() test fixture
- reset plugin and mCdm smart pointers in TearDown
- reduce code duplication
- remove MockDrmPluginListener, send*Event has gone private
Test: m libwvdrmdrmplugin_hal_test -j128
Test: m libwvdrmdrmplugin_hal_test WV_UNITTESTS_BUILD_TARGET=hidl -j128
Test: adb push $(OUT)/data/nativetest/libwvdrmdrmplugin_hal_test /data/nativetest/.
Test: adb shell LD_LIBRARY_PATH=/vendor/lib64 /data/nativetest/libwvdrmdrmplugin_hal_test
Bug: 217247987
Change-Id: I8bc0a390a88facbc890cf26872fd089afe87850a
2022-05-11 05:36:40 +00:00
Alex Dale
88a7ff7685
Added metrics for production readiness.
...
[ Merge of http://go/wvgerrit/151749 ]
Extended CryptoSession for recording the result of
OEMCrypto_ProductionReady().
Only OEMCrypto_SUCCESS is considered "production ready". With the
exception of OEMCrypto_ERROR_NOT_IMPLEMENTED, any other result is
vendor-specific and indicates not being production ready.
Bug: 231655151
Test: metrics_collections_unittest
Change-Id: Ia0e5603d7ee1290238cce63d0194ae1aced424c1
2022-05-10 18:04:11 -07:00
Robert Shih
ca2440f556
dumpsys widevine: print hex IDs to avoid garbled text
...
Includes minor format change for easier ingestion by other tools.
Bug: 231677822
Test: adb shell dumpsys android.hardware.drm.IDrmFactory/widevine
Change-Id: Ibd13c84bd8f93ea0fc6cbd38b56ef39541ecc867
2022-05-11 00:50:11 +00:00
Edwin Wong
e7fc768561
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev am: f8146ee716
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18140898
Change-Id: I9e178ea105015385ca5fe2c150b8f4aff273501c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:24:40 +00:00
Edwin Wong
f8146ee716
Merge "Add libwvdrmmediacrypto_hal_test for AIDL service." into tm-dev
2022-05-10 23:12:05 +00:00
Alex Dale
cce550d006
Added CDM support for production readiness reporting. am: cd5afa88a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/18195696
Change-Id: Ib668fd1bd21be93ccc0638d348f7997bb902b394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:37:42 +00:00
Alex Dale
cd5afa88a6
Added CDM support for production readiness reporting.
...
[ Merge of http://go/wvgerrit/151518 ]
Extended the CDM layer to report OEMCrypto's production readiness
via string property query.
If OEMCrypto implementents OEMCrypto_ProductionReady(), then the
reported readiness by the CDM will report "True" or "False".
If OEMCrypto does not implement OEMCrypto_ProductionReady() then no
level of readiness is assumed, and the CDM will report "Unknown".
Bug: 231655151
Test: run_prov30_tests and request_license_test
Change-Id: I6afe481ef00ac129d02b004eca89a65810bfbff8
2022-05-10 13:35:43 -07:00
TreeHugger Robot
dedba3996d
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: I9abc884ab878ca8bc288f1ae00df8caa175a7e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:35:25 +00:00
TreeHugger Robot
66e61fd671
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: I1a4fa1e9eb3ae389fc362732a515fe50675a71eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-09 15:12:01 +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
ba5c28e363
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: I5054995864e65066f8b786d8ce1fc544147de1c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 22:26:39 +00:00
Rahul Frias
6966dd7b20
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: I9f7c6d87f6ded4ff75a0fb731124d4374f451368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-06 22:26:16 +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