Commit Graph

42432 Commits

Author SHA1 Message Date
David Drysdale
565ec37d96 [RESTRICT AUTOMERGE] Allow extra error code in device ID attestation am: b18c757eda am: e2fbd7ea4c am: c19581ea9e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646738

Change-Id: I9f4d44c289a7643a2312673340d2ac1cbcfec19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:29:22 +00:00
Gabriel Biren
a18dbe9aed 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 am: 168aa157fa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2618209

Change-Id: I0f2da80fead1447c7d3f3201ca931bc63ab443d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 02:28:11 +00:00
David Drysdale
c19581ea9e [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: I5154111c9a2e38d136fdf551320ceaf82d670608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 01:44:36 +00:00
Gabriel Biren
168aa157fa 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: I74612c22badc62ddb0746bb9328959e4a95c97db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 01:43:22 +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
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
01ef7d14ed Add fix vts fail when configureMonitorEvent am: b79cbf50f1 am: d8baeb3916 am: 1b000d1343 am: 16f7986514 am: d9b167dfb6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2640754

Change-Id: I63da851d4890afc3783e65be609d3c15027abf36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 02:28:43 +00:00
mike liao
d9b167dfb6 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: I447ba1a504bf63009664ace5437cb8014978b751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 01:42:21 +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
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
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
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
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
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
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
Henry Fang
047d533cdc UEC is not static on real device, so check its range intead of specific value am: c2794f8c26 am: 44272133e5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2611423

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

Change-Id: Ic52778208de887ab8ff62b9e275c96fdd604215f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-02 23:09:07 +00:00
Henry Fang
c2794f8c26 UEC is not static on real device, so check its range intead of specific value
Change-Id: If165935ce639bac439af21f23b741ab2fa999bb9
bug:285561687
test: manaul
2023-06-02 17:15:12 +00:00
Gabriel Biren
dbf86959ab Skip HIDL v1.6 RTT responder VTS tests if the am: 9c7ff0f4e0 am: 5bcbb62667 am: 4271b902ef
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2600788

Change-Id: I75b42f194ad30a27dd88c4f747ef5d34a94026d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 02:24:14 +00:00
Gabriel Biren
4271b902ef Skip HIDL v1.6 RTT responder VTS tests if the am: 9c7ff0f4e0 am: 5bcbb62667
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2600788

Change-Id: I45b57ef94974920f6fd6e1c9c127e2fb38d4246b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 01:40:36 +00:00
Gabriel Biren
5bcbb62667 Skip HIDL v1.6 RTT responder VTS tests if the am: 9c7ff0f4e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2600788

Change-Id: I30dfa5d5c2a81214949413d948424ca3f82f3e3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 00:50:07 +00:00
Gabriel Biren
9c7ff0f4e0 Skip HIDL v1.6 RTT responder VTS tests if the
capabilities do not indicate responder support.

Bug: 280550766
Test: atest VtsHalWifiRttV1_6TargetTest
Change-Id: I4e76a874837c6199b2bef65b3f0c138260972b4a
(cherry picked from commit e8aca0a7aa)
2023-05-23 16:40:08 +00:00
Sarah Kim
ef579e29e6 Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa am: c5bde9bbcd am: 18cd0f0954 am: 2637e14916 am: 5aa3dcb21d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572133

Change-Id: I11b303533b1c3e77adabab160eb19eb3aa570e55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 21:35:56 +00:00
Sarah Kim
5aa3dcb21d Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa am: c5bde9bbcd am: 18cd0f0954 am: 2637e14916
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572133

Change-Id: I21e04e7f15abf82d9abd0ad962b4969272e36c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 20:56:27 +00:00
Sarah Chin
36bc4c8fc2 Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9 am: 0aae7cccd0 am: 0db1cc0601 am: 0647236cfe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574430

Change-Id: I58693fdb246470b2f5dc5e000a4a58c146a1d0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 20:32:19 +00:00
Sarah Kim
2637e14916 Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa am: c5bde9bbcd am: 18cd0f0954
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572133

Change-Id: Iada69110075c472c2dba5dc9eb1d44d1a9b936bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 20:06:35 +00:00
Sarah Chin
0647236cfe Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9 am: 0aae7cccd0 am: 0db1cc0601
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574430

Change-Id: I5d578238e3a56460098977c3ba7cc8e054f61265
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 19:50:41 +00:00
Sarah Kim
18cd0f0954 Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa am: c5bde9bbcd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572133

Change-Id: I462f8665e402cdeeef80b0babd184400fbc66a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 19:24:06 +00:00
Sarah Chin
0db1cc0601 Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9 am: 0aae7cccd0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574430

Change-Id: I3e5d784484dad28e3e5136fe4281f794add85d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 19:03:54 +00:00
Sarah Kim
c5bde9bbcd Merge "Fix broken and flaky VTS tests" into android12-tests-dev am: 3323c87bfa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2572133

Change-Id: Ia3a9b69291efc526cfe8a2161145d563edf6ee4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 18:47:23 +00:00
Sarah Chin
0aae7cccd0 Backport VTS fixes to previous test versions am: 526a3a297b am: 64816a99b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574430

Change-Id: If38943222d0d5687f7f12866ad147401c4ee8292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 18:21:42 +00:00
Sarah Kim
3323c87bfa Merge "Fix broken and flaky VTS tests" into android12-tests-dev 2023-05-01 18:06:17 +00:00
Sarah Chin
64816a99b9 Backport VTS fixes to previous test versions am: 526a3a297b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574430

Change-Id: Icc1838d577a8bd1dae4ca8b5b0524779354346c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-01 17:43:32 +00:00
Sarah Chin
526a3a297b Backport VTS fixes to previous test versions
Network scan check periodicity only if scan type is PERIODIC.
Fix MCC/MNC checks to handle null strings.

Test: atest VTS
Bug: 259674407
Change-Id: I77e0706f413ce9defb174f00ee145dcc01f5d780
Merged-In: I77e0706f413ce9defb174f00ee145dcc01f5d780
(cherry picked from commit 8ab8f0d1d8)
2023-04-30 23:48:50 +00:00
Sarah Chin
b0c69d0859 Require SIM card for all VTS tests am: 9426eab44a am: 9973f65f95 am: 5b303d2fbb am: 756ea557c1 am: 4c758b39f6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569893

Change-Id: Idd220fc63f7177ffc683eca2d8942b66685443d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 23:22:38 +00:00
Sarah Chin
4c758b39f6 Require SIM card for all VTS tests am: 9426eab44a am: 9973f65f95 am: 5b303d2fbb am: 756ea557c1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569893

Change-Id: I1f9e9891116117e29ae87c3894ea71d94b627419
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 22:41:22 +00:00
Sarah Chin
756ea557c1 Require SIM card for all VTS tests am: 9426eab44a am: 9973f65f95 am: 5b303d2fbb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569893

Change-Id: I777f00f5eee3c5fffb2152de83bb705c058f1bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 21:56:08 +00:00
Sarah Chin
5b303d2fbb Require SIM card for all VTS tests am: 9426eab44a am: 9973f65f95
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569893

Change-Id: I934fe99e216d7e967d30861d6ca8b8e46b3e2b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 21:35:27 +00:00
Sarah Chin
9973f65f95 Require SIM card for all VTS tests am: 9426eab44a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2569893

Change-Id: I2769b1f7e7da440cfa4d6e8d85d59eaa5af63148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 21:01:30 +00:00
Jayachandran C
883c7dca39 Merge "Fix fail on RadioConfigTest#checkPortInfoExistsAndPortActive for dual-SIM detection" into android13-tests-dev am: 2b072c63c9 am: caf536d72a am: 265db399d4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2530680

Change-Id: Iaa0770ff968c7fd0b2bb35d87985f7c797965233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 22:01:37 +00:00