Commit graph

53148 commits

Author SHA1 Message Date
David Drysdale
85105d09b7 Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev
* changes:
  Fix attestation error checks
  Allow extra error code in device ID attestation
2023-07-12 09:31:43 +00:00
liuxiangjun
1d611fec5f Return INVALID_ ARGUMENTS is the expected result am: 7ddd478150
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2648141

Change-Id: I3811ee46d22121f0809885efd2ef4cc0818fba76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 03:02:37 +00:00
Gabriel Biren
3f7bfd2dc5 Represent NAN callback events as a bitmap
to better handle overlapping events.

Reimplementation of aosp/2473685 for
the AIDL VTS tests.

Bug: 290318208
Test: atest VtsHalWifiNanIfaceTargetTest
Change-Id: I1a0e6ab8dd529c10fcec8f26424a7181e7d91568
2023-07-11 22:23:34 +00:00
David Drysdale
35621098de Fix attestation error checks
Avoid the ADD_FAILURE at the end if attestion ID failure uses an allowed
return code.

Test: VtsAidlKeyMintTargetTest
Bug: 286733800
(cherry picked from https://android-review.googlesource.com/q/commit:810fbcffed8e86a3b53e8212ce4fdb64971d812f)
Change-Id: I0dcac312ac4516a078b2742721e3a19074da52b1
Merged-In: I0dcac312ac4516a078b2742721e3a19074da52b1
2023-07-06 13:02:48 +01:00
David Drysdale
94042a987c Allow extra error code in device ID attestation
Generalize the existing helper function to allow more variants.

Remove a couple of pointless invocations of the existing helper.

Bug: 286733800
Test: VtsAidlKeyMintTargetTest
(cherry picked from https://android-review.googlesource.com/q/commit:f42238c99ffe0df2e51cec84a96ed859a878b2b0)
Merged-In: Ic01c53cbe79f55c2d403a66acbfd04029395c287
Change-Id: Ic01c53cbe79f55c2d403a66acbfd04029395c287
2023-07-06 13:01:24 +01: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
5e896c9899 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow extra error code in device ID attestation" into android13-tests-dev am: b68968f638 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I655c11a738929da6ff26aa08f08c7ab139fa46b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:58:41 +00:00
David Drysdale
bbfbf2f9d6 [automerger skipped] [RESTRICT AUTOMERGE] Allow extra error code in device ID attestation am: b18c757eda -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81333034f40e59341d1d826a25a14c10eccd1b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:58:37 +00:00
Gabriel Biren
38beddf384 [automerger skipped] Merge "Add a new utility class wifi_hidl_test_utils_1_6 for the Wifi VTS tests." into android13-tests-dev am: 73e10b765f -s ours
am skip reason: Merged-In I2571876149fc14c8de02e1cec9934dd052cada5c with SHA-1 cd6da07327 is already in history

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

Change-Id: Ifa837a3735726c13a389c6bd1e2df4b7dcdfb333
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:57:19 +00:00
Gabriel Biren
f6adcdb126 [automerger skipped] Add a new utility class wifi_hidl_test_utils_1_6 am: eadd5160d8 -s ours
am skip reason: Merged-In I2571876149fc14c8de02e1cec9934dd052cada5c with SHA-1 cd6da07327 is already in history

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

Change-Id: If8c5aa9e882d7771587f47b68d34959bddb9ee98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:57:15 +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
Yuyang Huang
32d8479f86 Merge "Add TV devices that have MdnsOffloadManagerService to APF exempt list" into stage-aosp-udc-ts-dev 2023-06-30 06:25:52 +00:00
mike liao
f0a28188be 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: I9950528cab789b86f1f53e19d3d840e063551b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:54:37 +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
Austin Borger
263e362091 Camera VTS: Properly initialize Stream in various places
useCase and colorSpace are not explicitly initialized. colorSpace must
be explicitly initialized to UNSPECIFIED, as its default value is not
zero. Without initialization, the HAL will receive incorrect Stream
data.

Bug: 287305593
Test: Ran full VTS test on Cuttlefish / OEM testing.
Change-Id: I6a29600b5dc06ebdc61b38e0585204fe52d590c2
2023-06-29 00:49:17 +00:00
Yuyang Huang
54bbf07e06 Add TV devices that have MdnsOffloadManagerService to APF exempt list
For Panel TV devices, the vendor can implemented TV specific mDNS
offload instead of APF in U. If TV specific mDNS offload is implemented.
MdnsOffloadManagerService will exist in the system ext partition. The
APF vts will be skipped if MdnsOffloadManagerService exist.

Bug: 283038712
Test: atest VtsHalWifiStaIfaceTargetTest
Change-Id: If55ec42507460b9a2c6eee683d85b8109f2af236
2023-06-28 02:24:35 +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
mike liao
8b39328dcc 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
(cherry picked from commit def4652792)
2023-06-27 16:42:23 +00:00
Bharatt Kukreja
b082ae031f Merge "Camera: Add links to mandatory stream combination tables" into udc-dev 2023-06-19 19:36:54 +00:00
Gabriel Biren
0f1628e1ac Merge "Set the value of using_dynamic_iface_combination_ in the WifiChip constructor." into udc-dev 2023-06-16 20:58:26 +00:00
Rocky Fang
25d4025065 Merge "Ignore NanSessionStateChange test for old HAL" into udc-dev 2023-06-16 16:44:48 +00:00
Changyeon Jo
e79e89d070 Increase frame counters in the same critical section am: 928a4535c8 am: a343d0cf0c am: c070b5a14b am: 55baee93d6 am: e0868c4484 am: 62ad051d97 am: e814934db9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2594993

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

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

Change-Id: If414ff886a8c2e6c336289e89f73719d740ac73c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 02:24:19 +00:00
Changyeon Jo
62ad051d97 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: I3c5cdded17732406c64d375c60073dc6c59b38da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16 01:41:18 +00: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
Rocky Fang
781409825d Ignore NanSessionStateChange test for old HAL
Test: Tested on V1 HAL, before this change, it failed. After this
change, it showed ignored.
Bug: 287400067

Change-Id: I171cfd08da97d0b5830d241a9cd6ce2fa1f899dc
2023-06-16 00:42:41 +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
01cf38f349 Merge "Improve process to run the Vendor HAL gTest suite." into udc-dev 2023-06-15 00:12:52 +00:00
Gabriel Biren
80f5392763 Improve process to run the Vendor HAL gTest suite.
This includes:
 - Adding a README to help users get started.
 - Improving the test script to avoid issue where
   device is not ready for the next ADB command
   after 'adb root'.

Bug: 271914366
Test: Manual test
       1. Reboot device.
       2. ./runtests.sh
       3. Tests are expected to execute.
Change-Id: I9f452384a7067708f617d1e932f06b2f5c7ab119
2023-06-14 22:53:28 +00:00
Gabriel Biren
989c78a51f Set the value of using_dynamic_iface_combination_
in the WifiChip constructor.

gTest suite currently cannot mock the legacy HAL
call for getSupportedIfaceConcurrencyMatrix.
If we set using_dynamic_iface_combination_ to true
in the unit tests, we can avoid making this call.

Bug: 271914366
Test: ./runtests.sh # gTest
Test: atest VtsHalWifiChipTargetTest # VTS
Change-Id: Ic43daab6ff5fdc5f78af614ad775f436fbbe8726
2023-06-14 22:45:29 +00:00
Bharatt Kukreja
3e4fbc9a22 Camera: Add links to mandatory stream combination tables
Bug: 271143048
Test: Documentation change

Change-Id: I570994c084e730750aa5205b7f97c7546d75b58d
2023-06-14 21:49:32 +00:00
Peiyong Lin
6f14da4e93 Merge "Avoid skipping test if it's supported." into udc-dev 2023-06-14 19:49:43 +00:00
Peiyong Lin
9fb755319b Avoid skipping test if it's supported.
Previously the test will be skipped regardless whether setThreads is
supported, this patch moves the check below and check the returned
status code to determine whether the test should be skipped.

Bug: b/287282833
Test: atest VtsHalPowerTargetTest
Change-Id: I9ce6b4ead5e245478247903a75922ece74f38ee7
2023-06-14 18:12:39 +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
Gabriel Biren
5df702513f Merge "Add a new utility class wifi_hidl_test_utils_1_6 for the Wifi VTS tests." into udc-dev 2023-06-06 20:01:57 +00:00
Gabriel Biren
cd6da07327 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
2023-06-05 22:52:52 +00:00
Henry Fang
38f85d6bac UEC is not static on real device, so check its range intead of specific value am: c2794f8c26 am: 44272133e5 am: 047d533cdc am: 176d59adcd am: 853a2a5a08 am: 16fcf4466f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611423

Change-Id: I578232231ff5fc492f9381830875cb6b04308084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 02:40:48 +00:00
Henry Fang
16fcf4466f UEC is not static on real device, so check its range intead of specific value am: c2794f8c26 am: 44272133e5 am: 047d533cdc am: 176d59adcd am: 853a2a5a08
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611423

Change-Id: I389c4a3374660085a3d1a0122c4475fd3075b0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:57:34 +00:00
Henry Fang
848aa5c246 UEC is not static on real device, so check its range intead of specific value am: c2794f8c26 am: 44272133e5 am: 047d533cdc am: 176d59adcd am: cb0946d2c5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611423

Change-Id: I7d26236754b2e44b6a9988b57cc5c938573c37d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:53:59 +00:00
Henry Fang
853a2a5a08 UEC is not static on real device, so check its range intead of specific value am: c2794f8c26 am: 44272133e5 am: 047d533cdc am: 176d59adcd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611423

Change-Id: I296bdea79464a2b293d5072645837af75bc429e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:13:12 +00:00
Henry Fang
cb0946d2c5 UEC is not static on real device, so check its range intead of specific value am: c2794f8c26 am: 44272133e5 am: 047d533cdc am: 176d59adcd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611423

Change-Id: If1dbc260d6710607dffff624cf8b9c64b29f93c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 01:11:47 +00:00
Henry Fang
176d59adcd UEC is not static on real device, so check its range intead of specific value am: c2794f8c26 am: 44272133e5 am: 047d533cdc
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611423

Change-Id: Idb109c58dbf61c9ea7c044412de8131474e97754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-03 00:19:59 +00:00