Commit graph

1798 commits

Author SHA1 Message Date
Gabriel Biren
f356c8b654 Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837 am: 369df82b89 am: 36b3a962ab am: 0fc404280f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: I9144f5ba40d51064c5bf4491171b3708f4c87141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 03:17:34 +00:00
Gabriel Biren
0fc404280f Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837 am: 369df82b89 am: 36b3a962ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: I65c0ce4ff152b3e65a1ef6003358a36ba817e514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 02:12:26 +00:00
Gabriel Biren
369df82b89 Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784 am: 93ce27b837
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: Idad98c56ad219fd26f7e26e4b1c66df90d35646c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 00:37:32 +00:00
Gabriel Biren
93ce27b837 Merge "Disable Wi-Fi framework during VTS" into main am: bddf425784
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2728874

Change-Id: Idf7f13190d2e731afa4633b7bc31437ae2ed0ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:41:06 +00:00
Gabriel Biren
e8566c8e7d Rename toggleWifiFramework in the Hostapd am: ff914778ef am: bec9c969af am: ad2bd3d243 am: 615ebc2a61
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24772977

Change-Id: If874fd8070b54df8534b46f478329c29156f1c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:40:44 +00:00
Gabriel Biren
615ebc2a61 Rename toggleWifiFramework in the Hostapd am: ff914778ef am: bec9c969af am: ad2bd3d243
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24772977

Change-Id: Ia0bdba896a535b74cad394ea50f43426fbe7082a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 20:57:14 +00:00
Gabriel Biren
11d6365d10 Rename toggleWifiFramework in the Hostapd am: ff914778ef am: bec9c969af
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24772977

Change-Id: I3c9029c58e34759df9d75ab01357b90bb3273782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:56:20 +00:00
Gabriel Biren
ff914778ef Rename toggleWifiFramework in the Hostapd
AIDL test utils in order to avoid having
an ambigous function call.

aosp/2728874 adds a method of the same
name, which is causing pre-submit issues.

Bug: 297820612
Test: atest VtsHalHostapdTargetTest
Change-Id: Ie4da0a0037e7411e7908401f021b48246ea227bd
Merged-In: Ie4da0a0037e7411e7908401f021b48246ea227bd
(cherry picked from commit 94950dc20d)
2023-09-15 16:59:29 +00:00
Treehugger Robot
de729a3705 Merge "Rename toggleWifiFramework in the Hostapd AIDL test utils in order to avoid having an ambigous function call." into main 2023-09-15 01:21:40 +00:00
Gabriel Biren
94950dc20d Rename toggleWifiFramework in the Hostapd
AIDL test utils in order to avoid having
an ambigous function call.

aosp/2728874 adds a method of the same
name, which is causing pre-submit issues.

Bug: 297820612
Test: atest VtsHalHostapdTargetTest
Change-Id: Ie4da0a0037e7411e7908401f021b48246ea227bd
2023-09-14 23:41:45 +00:00
Ye Jiao
46538346af Disable Wi-Fi framework during VTS
When VTS case kills supplicant in SetUp, Wi-Fi framework will trigger
recovery process and causes races between VTS and Wi-Fi framework.

Disable Wi-Fi framework using 'cmd wifi' in SetUp.

Bug: 297820612
Test: run vts -m VtsHalWifiHostapdV1_0TargetTest with new case
Change-Id: I5ea7f00cfebf79021185f66766454d053c973b31
2023-09-14 01:19:47 +00:00
Gabriel Biren
c320fbaf1f Merge changes I917be24b,Ia10d3805 into main
* changes:
  Skip AP and P2P tests in wifi_chip_aidl_test if those iface types cannot be created.
  Add AIDL VTS helper method to check whether the specified iface type is supported.
2023-09-11 19:35:25 +00:00
Gabriel Biren
e8e161e255 Skip AP and P2P tests in wifi_chip_aidl_test
if those iface types cannot be created.

Bug: 297959416
Test: atest VtsHalWifiChipTargetTest
Change-Id: I917be24bb46b74fe3fb9d08e8af099b782e19469
2023-09-11 17:15:28 +00:00
Gabriel Biren
70b126cd25 Add AIDL VTS helper method to check whether
the specified iface type is supported.

Bug: 297959416
Test: atest VtsHalWifiChipTargetTest \
      VtsHalWifiStaIfaceTargetTest \
      VtsHalWifiApIfaceTargetTest \
      VtsHalWifiNanIfaceTargetTest \
      VtsHalWifiRttControllerTargetTest
Change-Id: Ia10d3805c5ebb5dd3e3e07b6106c0879f1764943
2023-09-08 18:04:42 +00:00
Ryan Prichard
c5ba9b1abd Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305 am: 3e5ee9a6e6 am: 5742e2ba25
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603

Change-Id: I262b7ff132cfcd1bd8d21d6528d13d76fc075998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 22:48:54 +00:00
Ryan Prichard
3e5ee9a6e6 Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603

Change-Id: I69ab8927b8f8b4fc4ad559c9a65a8f4a58a4e893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:23:50 +00:00
Ryan Prichard
3cef7f7bfe Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining it again" into main 2023-09-07 21:09:05 +00:00
Gabriel Biren
7373343a1a Check for null pointers in all public
methods in wifi_aidl_test_utils.

Bug: 298747174
Test: atest VtsHalWifiSupplicantStaIfaceTargetTest \
            VtsHalWifiSupplicantStaNetworkTargetTest \
            VtsHalWifiSupplicantP2pIfaceTargetTest
Change-Id: I042f024a30f3afb1425816c350fddf98fbe526ef
2023-09-07 20:46:43 +00:00
Sunil Ravi
2079fbcd04 wifi: set join to true in p2p connect tests am: 858665687d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743883

Change-Id: I961f6a8cc9569ad401a1df41f252325f94392350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:41:10 +00:00
Ryan Prichard
4dcd87fbef [RESTRICT AUTOMERGE] Undefine NAN before defining it again
After upgrading libc++, math.h happens to be included at the point
where this file tries to define NAN. Redefining a macro to a different
value is an error, but #undef'ing a macro is OK even if the macro isn't
actually defined.

Bug: b/175635923
Test: treehugger
Change-Id: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
Merged-In: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
2023-09-06 18:42:10 -07:00
Ryan Prichard
99a4f3cf62 Undefine NAN before defining it again
After upgrading libc++, math.h happens to be included at the point
where this file tries to define NAN. Redefining a macro to a different
value is an error, but #undef'ing a macro is OK even if the macro isn't
actually defined.

Bug: b/175635923
Test: treehugger
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd390faa2fcb49ce0e0ebc6ef180118ec370f957)
Merged-In: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
Change-Id: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
2023-09-07 01:41:11 +00:00
Ryan Prichard
ab2b50a906 Merge "Undefine NAN before defining it again" into main 2023-09-07 01:33:16 +00:00
Sunil Ravi
858665687d wifi: set join to true in p2p connect tests
After adding ag/21179155, auto join flag is
not set for every p2p connect command. The tests
are passing an unknown peer MAC address to connect(). To
pass the tests, the connect should trigger a scan and
try to find this unknown mac address. So set join flag
to true to run the same scan logic.

Bug: 298310537
Bug: 268236829
Bug: 218608010
Test: atest VtsHalWifiSupplicantP2pIfaceTargetTest
Change-Id: Id5baa0f599d11a3563780aae15ff3cea0407060c
Merged-In: Id5baa0f599d11a3563780aae15ff3cea0407060c
2023-09-06 23:30:32 +00:00
Nethaji B
176cedc0bd Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6 am: 7d5727bf65 am: 1c2d61fa57 am: 5c5332f235 am: b9a3ec5cba am: ed306b3146
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896

Change-Id: I41b03e86b5961f0223a4cdb2b94096fc5649bda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 21:08:32 +00:00
Nethaji B
490ebb3144 Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6 am: 7d5727bf65 am: 1c2d61fa57 am: 5c5332f235 am: 0ab2ff24f6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896

Change-Id: If280b5b756b57ef37fcaa111d6e56475673ac5ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 20:35:43 +00:00
Nethaji B
e20d2cc6e7 Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6 am: 7d5727bf65 am: 37fb2fe77d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896

Change-Id: I5e37d8c9f66ba3d54ad62a969735397db3d4d228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:58:07 +00:00
Nethaji B
1c2d61fa57 Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6 am: 7d5727bf65
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896

Change-Id: Ie0b7bdaf3d9d907b969e40cae85d566bc1f15048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:05:25 +00:00
Nethaji B
37fb2fe77d Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6 am: 7d5727bf65
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896

Change-Id: I4eade72a9c5fa16035382a52ed1d6be69edd67e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 18:00:56 +00:00
Nethaji B
7d5727bf65 Skip wifi AP tests, if AP feature is not supported am: 6eab68a9e6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2740896

Change-Id: I653411aa1c02a8025c145444b6ee1f749116ee39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 17:17:15 +00:00
Nethaji B
6eab68a9e6 Skip wifi AP tests, if AP feature is not supported
- Added API to check wifi chip supports AP interface
- Check AP support as a precondition for AP related TCs

Bug: 284925541
Test: atest VtsHalWifiApV1_5TargetTest
Change-Id: I1121d7b787ed972980bab0e05a52f3ca2f3d0a24
2023-09-05 19:56:15 +00:00
Gabriel Biren
639d0d8f06 Use the hostapd_test_utils helper methods in am: c6cacf6149 am: b2d1a3b4c7 am: 9af8f6c18d am: b17aeef124
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24589850

Change-Id: I5e17279bc315ec1cadfe7bee661d96698899dd5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 05:32:13 +00:00
Gabriel Biren
ae1b183f6a Add hostapd_test_utils helper methods for the am: 3454ce179a am: b3a1c6260f am: 1539083a4d am: 61ae64167c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24589589

Change-Id: Iaa985dfcb8d07e95e940731c0e35c9f5f0a15687
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 05:32:10 +00:00
Gabriel Biren
4ac4abb781 Use the hostapd_test_utils helper methods in am: c6cacf6149 am: b2d1a3b4c7 am: 12e28a2bce
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24589850

Change-Id: I85d9f37d0222bbe77fbcd5e8a592ab12d83d9c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 04:55:32 +00:00
Gabriel Biren
7841a9d0a9 Add hostapd_test_utils helper methods for the am: 3454ce179a am: b3a1c6260f am: 4d3fa592d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24589589

Change-Id: Icb61182c342d488a4dab77d6334a06dca52e69ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 04:55:28 +00:00
Ryan Prichard
dd390faa2f Undefine NAN before defining it again
After upgrading libc++, math.h happens to be included at the point
where this file tries to define NAN. Redefining a macro to a different
value is an error, but #undef'ing a macro is OK even if the macro isn't
actually defined.

Bug: b/175635923
Test: treehugger
Change-Id: Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b
2023-08-31 19:32:59 -07:00
Gabriel Biren
c6cacf6149 Use the hostapd_test_utils helper methods in
the Hostapd AIDL VTS tests.

At the beginning of each test, we now:
 1. Disable the Wifi framework, Hostapd, and Vendor HAL.
 2. Enable the Hostapd and Vendor HAL.

At the end of each test, we now:
 1. Disable the Hostapd and Vendor HAL.
 2. Enable the Wifi framework.

Bug: 283402709
Test: atest VtsHalHostapdTargetTest --iterations 10
       # Tested on both an Android T and U device.
       # All tests passed in both cases.
Change-Id: I8b5e24ad44d13fad09d84f1b212e60ca8df3aa7e
2023-08-30 19:11:00 +00:00
Gabriel Biren
3454ce179a Add hostapd_test_utils helper methods for the
Hostapd AIDL VTS tests.

Main purpose will be to enable/disable the
HALs and Wifi framework before and after
each test.

Bug: 283402709
Test: atest VtsHalHostapdTargetTest
Change-Id: Ib3ceca4ad25f472e1b75fa95661235c880a489fd
2023-08-30 19:09:30 +00:00
Mahesh KKV
49d750c25c Merge "Fix Legacy to AIDL conversion for link state" into udc-qpr-dev am: d7175ec8e7 am: cafe6e94ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24513722

Change-Id: I3182824b6efe5c24471717e081a14cfd4b9b2ced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24 01:07:55 +00:00
maheshkkv
236b04d3c3 Fix Legacy to AIDL conversion for link state
Bug: 296807191
Test: hardware/interfaces/wifi/aidl/default/tests/runtests.sh
Change-Id: Iea60d7894b22558b386f62a77ff43aa374b6c40f
2023-08-22 17:52:00 +00:00
Jaewan Kim
5b454f372e Disable verbose nlinterceptor log
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 18:03:56 +00:00
Gabriel Biren
df4463b3b5 Merge "Use a 64-bit instance of 0x1 when creating the event bitmask." into udc-qpr-dev am: 140534a783 am: dc53a4ca8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24058886

Change-Id: I0bad0dfa93843579fc80668ef927b157af71ae67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 00:53:31 +00:00
Gabriel Biren
4c3eeb417e Use a 64-bit instance of 0x1 when creating
the event bitmask.

Comments on ag/24025770 suggest that the bit
shift will lead to undefined behavior for
event codes greater than 31.

Bug: 290318208
Test: atest VtsHalWifiNanIfaceTargetTest
       # manually set some of the expected
       # events codes to > 31 to verify that
       # the bit shift works as expected
Change-Id: I09e11dac8acf90baf047e24cebe1d01970b1dc8a
2023-07-13 19:46:59 +00:00
Gabriel Biren
1f06b4bf76 Use a 64-bit instance of 0x1 when creating
the event bitmask.

Comments on ag/24025770 suggest that the bit
shift will lead to undefined behavior for
event codes greater than 31.

Bug: 290318208
Test: atest VtsHalWifiNanIfaceTargetTest
       # manually set some of the expected
       # events codes to > 31 to verify that
       # the bit shift works as expected
Change-Id: I09e11dac8acf90baf047e24cebe1d01970b1dc8a
2023-07-13 18:24:14 +00:00
Gabriel Biren
44cf0eae1b Represent NAN callback events as a bitmap am: 3a34c72b61 am: 46961ab73f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24025770

Change-Id: I418b1aa6d1644ec3de97dd3c22ef1cba2e5bac49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 00:05:34 +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
Gabriel Biren
3a34c72b61 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 21:23:31 +00:00
Yuyang Huang
50c033fe79 Merge "Add TV devices that have MdnsOffloadManagerService to APF exempt list" into stage-aosp-udc-ts-dev am: 32d8479f86 am: 5d0f680ed9 am: 8d0d289758
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23831006

Change-Id: Id4fd3f80c084f5d0d9a597035934f1aa0b7978d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 08:36:10 +00:00
Yuyang Huang
f9c27cb05a Merge "Add TV devices that have MdnsOffloadManagerService to APF exempt list" into stage-aosp-udc-ts-dev am: 32d8479f86 am: 5d0f680ed9 am: 76dd769ca0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23831006

Change-Id: Iff133169efebbd1cdc7948399cabb57cc1ead6c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 08:32:04 +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
Ye Jiao
26515fa331 Fix memory leak in WifiLegacyHal. am: 84310761ce am: aa1f8755c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23772717

Change-Id: I0954dbcf561b6e16bb98ebb69fa5238031eea0f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-22 02:26:12 +00:00