Commit graph

42396 commits

Author SHA1 Message Date
Igor Tolkov
63d39e635b Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest am: 8c32f711b5 am: 12320fd071 am: cd47557c62 am: 353d2dc2f5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2709435

Change-Id: I5feedc6f48810d6a1f7b8e08447345b3a65bc007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 08:58:17 +00:00
Igor Tolkov
353d2dc2f5 Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest am: 8c32f711b5 am: 12320fd071 am: cd47557c62
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2709435

Change-Id: I330f267aef7e8728dec208b5bbbc1a6a655cae80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 08:26:29 +00:00
Igor Tolkov
cd47557c62 Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest am: 8c32f711b5 am: 12320fd071
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2709435

Change-Id: Id19f7f18a9a374e92a5790240adf260aa1f92b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 07:57:21 +00:00
Igor Tolkov
12320fd071 Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest am: 8c32f711b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2709435

Change-Id: Ib6d8d85f2aafbaed23264a55d66c7e0aa3d36bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 07:26:57 +00:00
Tri Vo
8fc264aa16 Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b82 am: a012a313fc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660177

Change-Id: I06f677ac7f4a724714733dabee6c38fe0f76033a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 21:49:37 +00:00
Tri Vo
542580ff08 KM 4: Add Root-of-Trust test cases am: 727b45bf4f am: b74ba57921
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660176

Change-Id: I8a74eadc375dc9f0691a71fc28847af0d25a4f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 21:49:33 +00:00
Tri Vo
a012a313fc Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev am: c8b9250b82
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660177

Change-Id: I6894d7cba412adf275f471cba73d9b98b3ea23a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 21:15:16 +00:00
Tri Vo
b74ba57921 KM 4: Add Root-of-Trust test cases am: 727b45bf4f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2660176

Change-Id: I38112b6028bd8e6639a0fe67de606af4b13eee74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 21:15:11 +00:00
Tri Vo
c8b9250b82 Merge changes I8b34a94c,I46e62ab9 into android13-tests-dev
* changes:
  KeyMint: Add Root-of-Trust test cases
  KM 4: Add Root-of-Trust test cases
2023-08-17 20:20:16 +00:00
Igor Tolkov
8c32f711b5 Move StopServicesSetup later in VtsHalBluetoothV1.0TargetTest
Move StopServicesSetup after RunCommandTargetPreparer in
VtsHalBluetoothV1_0TargetTest. RunCommandTargetPreparer requires
settings service, which is not available after StopServicesSetup.

Bug: 293822620
Test: run vts -m VtsHalBluetoothV1_0TargetTest and inspect logs to make
sure no preparer steps fail.

Change-Id: I935d19c5e941bfdb122554d8c413d3095fef27ac
2023-08-16 15:24:25 +08:00
William Escande
3b5e10e8f3 Sync wait for the bluetooth to be disabled / enabled am: 29120123a8 am: 311d918dde am: f4924ed7a6 am: d53090a990
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2682567

Change-Id: I60cf83f0c13e6ba3d4893ae48d94bb485681445d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 06:22:13 +00:00
William Escande
d53090a990 Sync wait for the bluetooth to be disabled / enabled am: 29120123a8 am: 311d918dde am: f4924ed7a6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2682567

Change-Id: Ic3af2e5fab7fb4b54e6858c4ef3d9cbfd98b58e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 05:36:38 +00:00
William Escande
f4924ed7a6 Sync wait for the bluetooth to be disabled / enabled am: 29120123a8 am: 311d918dde
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2682567

Change-Id: I8615128eef8eb118f5b5ff055fadcad51e89118f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 04:53:10 +00:00
William Escande
311d918dde Sync wait for the bluetooth to be disabled / enabled am: 29120123a8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2682567

Change-Id: If48483f0c01b96f0c6bb26515886406bbe42c641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 04:11:47 +00:00
Jaewan Kim
a968c987c4 Disable verbose nlinterceptor log am: 6d24b2ff87
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24392696

Change-Id: I5ea63ce676489548c45b7143fba35cd7ee24a25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 16:46:26 +00:00
Jaewan Kim
6d24b2ff87 Disable verbose nlinterceptor log
Causing problems for folks trying to read logs in b/287414933 - should have been disabled previously.

Test: No verbose log on Cloud Android with Wi-Fi is turned on
Bug: 256518068
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7df5c1c34538d1e051dc3df63fcba563e40713c8)
Merged-In: I062e698b64114f139997cd24b16f90dd52048247
Change-Id: I062e698b64114f139997cd24b16f90dd52048247
2023-08-10 19:14:52 +00:00
William Escande
29120123a8 Sync wait for the bluetooth to be disabled / enabled
Bluetooth does not handle well conflicting message

Test: VtsHalBluetoothV1_0TargetTest
Test: VtsHalBluetoothV1_1TargetTest
Bug: 262645484
Bug: 262501652
Bug: 293822620
Change-Id: I0aca127fb5e5e33cc0086aaad19a8f1286fc83d6
(cherry picked from commit cd64ee13fb)
2023-07-31 06:40:19 +00:00
Hugo Drumond Jacob
efe4c95392 [automerger skipped] [DO NOT MERGE] Handle unavailable properties am: aeafec3db0 -s ours am: 373a052124 -s ours am: 61fef8b709 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654145

Change-Id: I71215658b62d8bf69f46b4c783cb59ddb4675f3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 14:14:39 +00:00
Hugo Drumond Jacob
61fef8b709 [automerger skipped] [DO NOT MERGE] Handle unavailable properties am: aeafec3db0 -s ours am: 373a052124 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654145

Change-Id: I04e5ea49287ae3fb1c1fad16375994ef5249dea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 12:21:33 +00:00
Hugo Drumond Jacob
373a052124 [automerger skipped] [DO NOT MERGE] Handle unavailable properties am: aeafec3db0 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2654145

Change-Id: I850f4b7d589b051086d05d2d59f7dec9d2d86537
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28 11:14:48 +00:00
Hugo Drumond Jacob
aeafec3db0 [DO NOT MERGE] Handle unavailable properties
Accommodate the case in which `set()` for an unavailable property is
called as the VHAL may return OK or NOT_AVAILABLE.

Also, it may be the case that certain properties aren't available
while testing and thus, setting a value and getting it right after
might not always work.

Bug: 290882809
Change-Id: I7b7b3f144c4fbd786bf673a86fcac110ec8f79b5
2023-07-25 18:09:28 +00:00
Tri Vo
e0fb4d0ce5 KeyMint: Add Root-of-Trust test cases
This patch is a squash of following patches:
 - aosp/2514097
 - aosp/2535086
 - aosp/2576910

Bug: 255344624
Test: VtsKeyMintAidlTargetTest
Change-Id: I8b34a94c11d7cc174821483f624fd083ca1763ac
Merged-In: I8b34a94c11d7cc174821483f624fd083ca1763ac
2023-07-20 18:05:24 -04:00
Tri Vo
727b45bf4f KM 4: Add Root-of-Trust test cases
This patch is a squash of following patches:
 - aosp/2582033
 - aosp/2603248

Bug: 255344624
Test: VtsHalKeymasterV4_0TargetTest
Change-Id: I46e62ab9031d3745f99bd214f9e579e80edc9128
Merged-In: I46e62ab9031d3745f99bd214f9e579e80edc9128
2023-07-20 18:05:18 -04:00
David Drysdale
e4cc51fe87 Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I9a2c1cb8d89525dfce2d9ca55e7bf51bc0ce6cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 07:58:38 +00:00
David Drysdale
b37f07acc2 Allow extra ID attestation error codes am: 3f6ab601b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973

Change-Id: I587cf99dc8621900889034503238ffdb94f2bda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13 07:10:47 +00:00
David Drysdale
3f6ab601b9 Allow extra ID attestation error codes
When deliberately testing invalid ID attestation, use the helper
function (which checks the error return code is correct) in one more
place.

Test: VtsAidlKeyMintTargetTest
Bug: 286733800
Change-Id: I6ea5bd7ee19b3b172330117bfde1b16745debba7
(cherry-picked from commit c68dc93788)
Merged-In: I6ea5bd7ee19b3b172330117bfde1b16745debba7
2023-07-12 13:58:41 +00:00
liuxiangjun
060cb55a52 Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150 am: 84065ce938
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648141

Change-Id: I48d14cec7c2127ee0bea4e1769fef0f46bad91b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 03:44:23 +00:00
liuxiangjun
84065ce938 Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648141

Change-Id: I23b46196520da63a60f6cb2b791d31ea336b7ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 02:57:45 +00:00
liuxiangjun
7ddd478150 Return INVALID_ ARGUMENTS is the expected result
For devices not in LTE service, the vts test returns INVALID_ ARGUMENTS is an expected result

Bug:289756066

Test:
VtsHalRadioV1_5TargetTest  PerInstance/RadioHidlTest_v1_5#startNetworkScan/0_slot1
VtsHalRadioV1_5TargetTest  PerInstance/RadioHidlTest_v1_5#startNetworkScan/1_slot2

Change-Id: I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40
Signed-off-by: liuxiangjun <liuxiangjun3@xiaomi.com>
Merged-In: I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40
2023-07-06 05:16:22 +00:00
Treehugger Robot
b0f22f7882 Merge "[RESTRICT AUTOMERGE] Allow extra error code in device ID attestation" into android13-tests-dev am: b68968f638 am: 4a8f074616
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646738

Change-Id: I8b813499a35812701a38e827c690a80b00108ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 01:43:37 +00:00
David Drysdale
c71b4ecd9d [RESTRICT AUTOMERGE] Allow extra error code in device ID attestation am: b18c757eda am: e2fbd7ea4c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646738

Change-Id: Ie74930e06f7085ff7e91a10df4098b1e971bf407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 01:43:34 +00:00
Gabriel Biren
382c9245b0 Merge "Add a new utility class wifi_hidl_test_utils_1_6 for the Wifi VTS tests." into android13-tests-dev am: 73e10b765f am: f3c8c80e1c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2618209

Change-Id: Ic46a30e9eac0ae205b2ac51fa2b2f21303971a47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 01:42:12 +00:00
Treehugger Robot
4a8f074616 Merge "[RESTRICT AUTOMERGE] Allow extra error code in device ID attestation" into android13-tests-dev am: b68968f638
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646738

Change-Id: I55000b3ccebd2905e41ba486bdece5adb1542035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:55:00 +00:00
David Drysdale
e2fbd7ea4c [RESTRICT AUTOMERGE] Allow extra error code in device ID attestation am: b18c757eda
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646738

Change-Id: Ie9d8c7131a3dc196536ac34a5917a0b826c7ec8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:54:57 +00:00
Gabriel Biren
f3c8c80e1c Merge "Add a new utility class wifi_hidl_test_utils_1_6 for the Wifi VTS tests." into android13-tests-dev am: 73e10b765f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2618209

Change-Id: Iedc6bf7c5038797044017f7c32ddddb82dae5b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:52:41 +00:00
Treehugger Robot
b68968f638 Merge "[RESTRICT AUTOMERGE] Allow extra error code in device ID attestation" into android13-tests-dev 2023-07-06 00:16:46 +00:00
Gabriel Biren
73e10b765f Merge "Add a new utility class wifi_hidl_test_utils_1_6 for the Wifi VTS tests." into android13-tests-dev 2023-07-06 00:16:22 +00:00
David Drysdale
b18c757eda [RESTRICT AUTOMERGE] Allow extra error code in device ID attestation
Generalize the existing helper function to allow more variants.

Manual cherry-pick of aosp/2627969 combined with aosp/2648423 to avoid
merge conflicts

Bug: 286733800
Test: VtsAidlKeyMintTargetTest
Merged-In: Ic01c53cbe79f55c2d403a66acbfd04029395c287
Merged-In: I0dcac312ac4516a078b2742721e3a19074da52b1

Change-Id: I328f7b3195d4b4dd1ed1da17377696261094ea76
2023-07-05 13:41:54 +01:00
mike liao
e7b4d2a2b7 Add fix vts fail when configureMonitorEvent am: b79cbf50f1 am: d8baeb3916 am: 1b000d1343 am: 16f7986514
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640754

Change-Id: I95d6887fe93cc51245c354560d934566f562fddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 01:41:17 +00:00
mike liao
16f7986514 Add fix vts fail when configureMonitorEvent am: b79cbf50f1 am: d8baeb3916 am: 1b000d1343
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640754

Change-Id: I9c5c3cbad82cfafd9cb6bff856d4672859050c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:50:35 +00:00
mike liao
1b000d1343 Add fix vts fail when configureMonitorEvent am: b79cbf50f1 am: d8baeb3916
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640754

Change-Id: I97914a24ec13a8c8278877907bd6f68012a0deb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:05:48 +00:00
mike liao
d8baeb3916 Add fix vts fail when configureMonitorEvent am: b79cbf50f1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640754

Change-Id: I48d3c2ecee071096c1b94c94293bb9b1cc39f839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 23:22:37 +00:00
mike liao
b79cbf50f1 Add fix vts fail when configureMonitorEvent
[Description]
VTS StartFilterInDemux failed when configureMonitorEvent is called

[Root Cause]
Scrambling status event is not notified when configureMonitorEvent is called
  so test case failed.

[Solution]
Scrambling status event is not notified because of no input data.
Add input setting and check event notified or not after data is input.

Test: Manual
bug: 288193021

Change-Id: If5875d064fd67b72f8299205a5e35b1a2bd61934
2023-06-27 11:25:43 -07:00
Changyeon Jo
ca64f5b140 Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c am: c070b5a14b am: 55baee93d6 am: e0868c4484
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: Ic4cd9e7c9fe0bbb9693a0c23a9309aae5527bcea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 01:40:32 +00:00
Changyeon Jo
e0868c4484 Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c am: c070b5a14b am: 55baee93d6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: I2d2344e3fc085cd09f459bb9a7f8eb01132da841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:49:45 +00:00
Changyeon Jo
55baee93d6 Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c am: c070b5a14b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: Ic0db29743b092a5a2d01860e76356a38e3e4788b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 00:04:30 +00:00
Changyeon Jo
c070b5a14b Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: Ibcaac170949c319d2cff5b45bc8114238d0ada7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 23:21:50 +00:00
Changyeon Jo
a343d0cf0c Increase frame counters in the same critical section am: 928a4535c8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

Change-Id: I8a59e6173179a284bb90960b30e2e5a35de075a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 22:39:21 +00:00
Changyeon Jo
928a4535c8 Increase frame counters in the same critical section
Bug: 275049370
Test: atest VtsHalEvsV1_0TargetTest
Change-Id: I814aac4edec142027d3802f5ee0d7a444ae2ee86
2023-06-15 21:11:09 +00:00
Gabriel Biren
eadd5160d8 Add a new utility class wifi_hidl_test_utils_1_6
for the Wifi VTS tests.

Main method is getBridgedWifiApIface_1_6, which
allows us to configure the chip based on the
Bridged AP IfaceConcurrencyType, rather than
the AP IfaceType like in getBridgedWifiApIface_1_5.

Implementations were largely copied from
wifi_hidl_test_utils and wifi_hidl_test_utils_1_5.

Bug: 283402709
Test: atest VtsHalHostapdTargetTest
       # tested on a Bluejay device that supports
       # the AddAccessPointWithDualBandConfig test
Change-Id: I2571876149fc14c8de02e1cec9934dd052cada5c
Merged-In: I2571876149fc14c8de02e1cec9934dd052cada5c
2023-06-06 22:09:59 +00:00