Commit graph

816 commits

Author SHA1 Message Date
Nick Desaulniers
d654bac57d Merge "[hardware][interfaces][wifi] fix -Wreorder-init-list" am: d1785cb7f6
am: 7d36ef505c

Change-Id: I40c82222ddb2798ab35d136e96fd2e5aa9827746
2019-10-15 22:14:29 -07:00
Nick Desaulniers
7d36ef505c Merge "[hardware][interfaces][wifi] fix -Wreorder-init-list"
am: d1785cb7f6

Change-Id: I43a36565bd9eb428e16384f5639328ac895ac71a
2019-10-15 22:05:23 -07:00
Nick Desaulniers
f5b16f32f5 [hardware][interfaces][wifi] fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: If22be04df7d2d0aae9ed50fada53d0ccd4edc9d1
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-10-14 11:06:08 -07:00
TreeHugger Robot
7b2e2fe15c Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master 2019-09-11 20:31:38 +00:00
Colin Cross
45cd136049 Remove unused libcrypto dependency. am: 5d81a5814b
am: 84633dea30

Change-Id: I660b0423d97e6402de84be904e0e84c6763518a3
2019-09-10 18:02:04 -07:00
Colin Cross
5d81a5814b Remove unused libcrypto dependency.
libcrypto is unused, which causes problems when boringssl hash
injection is turned on as the code is all stripped and there is
nothing left to inject the hash into.

Bug: 137267623
Test: Ran the following together with the changes from
      http://r.android.com/q/topic:bug137267623_bsslselftest

      m VtsHalDrmV1_{0,1,2}TargetTest \
        VtsHalWifiHostapdV1_{0,1}TargetTest{,Util} \
        VtsHalWifiSupplicantV1_{0,1,2}TargetTest{,Util} \
        VtsHalWifiSupplicantP2pV1_{0,2}TargetTest

      (croot hardware/interfaces/confirmationui ; mma)
      (croot hardware/interfaces/drm ; mma)
      (croot hardware/interfaces/keymaster ; mma)

Change-Id: Ib0607671ef71d99becb483774f810aad9762f4f1
2019-09-10 00:05:33 +01:00
Xin Li
15be13ea71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: Ia07db5c8afeed7fe22a2b18d867a38390f910a81
Merged-In: Ibbd540dbb5baee46360d3fe9469212cfd8f550ba
2019-09-08 13:06:54 -07:00
Steven Moreland
6684ee8c36 Merge "Remove libhwbinder/libhidltransport deps" am: 6b62c58a9a
am: 8c22c3862f

Change-Id: Iaedfceb49f81387f7deaad434613b7c9f1c502a0
2019-09-06 14:28:04 -07:00
Steven Moreland
b3a4d3832e Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I075670b64eebbbbd6a6ae0e84ad51bf1c6f5ba36
2019-09-06 01:07:02 +00:00
Robert Chou
fe8248cfdb Merge "hostapd: Ignore ACS relate vts testcase for hostapd 1.0 and hostapd 1.1" into qt-dev am: e9e4020560
am: 6059e56d92

Change-Id: If8c9aa3017825cdb8090d4d7504e39e4bca2f56e
2019-09-05 13:18:44 -07:00
lesl
6919cf1a70 hostapd: Ignore ACS relate vts testcase for hostapd 1.0 and hostapd 1.1
If driver doesn't support the hotspot ACS feature.
It will cause ACS relate vts testcase failure.
Temp disable the vts test case and file b/140172237 to fix in R.

Bug: 135975451
Test: build - make vts
Test: atest VtsHalWifiHostapdV1_1Target / atest VtsHalWifiHostapdV1_0Target
Test: vts-tradefed run commandAndExit vts-hal --skip-all-system-status-check \
      --primary-abi-only --skip-preconditions --module \
      VtsHalWifiHostapdV1_0Target -l INFO
      vts-tradefed run commandAndExit vts-hal --skip-all-system-status-check \
      --primary-abi-only --skip-preconditions --module \
      VtsHalWifiHostapdV1_1Target -l INFO

Change-Id: I489d5f5c54f37f3603128e127a6c8b1ee62390d3
2019-08-29 11:01:50 +08:00
Peter Kalauskas
05d36f94c2 Convert LazyServiceRegistrar usage to singleton
am: caed24ba9b

Change-Id: Id1a200b248b30209e8481a617bdfccefc5080134
2019-08-20 12:14:42 -07:00
Peter Kalauskas
caed24ba9b Convert LazyServiceRegistrar usage to singleton
Test: lshal
Bug: 139376253
Change-Id: I32cb803fb73aa15b52676847b6e7eb09b86657dc
2019-08-19 21:15:30 +00:00
Les Lee
29a52adadc Merge "WifiHal: Correct typo for code comment" am: 12ca95ccc4
am: 2ad166a35b

Change-Id: I56f8779232716fa51f9d7c3d649712fa6f0afe32
2019-08-13 01:35:38 -07:00
Les Lee
2ad166a35b Merge "WifiHal: Correct typo for code comment"
am: 12ca95ccc4

Change-Id: I97adbb5087c950df99af8962ff400978d5ad64af
2019-08-13 01:28:57 -07:00
lesl
83530c7fe9 WifiHal: Correct typo for code comment
Test: full build
Change-Id: Ia457f39d1d68527c2bdfaa700d45ead3d2064a52
2019-08-06 12:03:28 +08:00
Roshan Pius
39502371dd hostapd(vts): Use the correct syntax for vendor prop
am: 4335de4cac

Change-Id: I1e89831588dd3eec16e6e04cf2ac9446cac2ce65
2019-07-30 07:58:44 -07:00
Roshan Pius
4335de4cac hostapd(vts): Use the correct syntax for vendor prop
Change the prop to add "ro.vendor." prefix for the new vendor prop.

Bug: 136645414
Change-Id: I5edfdc98991068eac279975397b6a29313bf31da
2019-07-29 11:16:56 -07:00
Roshan Pius
3e01cbd710 Merge "hostapd(vts): Add a property for SAP interface" into qt-dev
am: 896c71a7d2

Change-Id: I6b1857fc92a3f42c5e82ed565f4fb38695934556
2019-07-18 18:18:57 -07:00
TreeHugger Robot
896c71a7d2 Merge "hostapd(vts): Add a property for SAP interface" into qt-dev 2019-07-19 00:57:14 +00:00
Roshan Pius
9a8538b4ee hostapd(vts): Add a property for SAP interface
Changes to the VTS test to support OEM's who use a separate
dedicated SAP interface.

Note: This is a VTS test change only. The default implementation does
not still support a dedicated SAP interface (OEM's can obviously
customize the default implementation for their devices).

Bug: 136645414
Test: None (verified by partner OEM)
Change-Id: I42b87bf90cfa90c7c218309164ab2b77f3685f9e
2019-07-18 14:38:41 +00:00
Xin Li
1942f9edaa DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master
Bug: 136196576
Change-Id: I58505f104075c7c210612eda8e266df9e3ecfeda
2019-07-09 15:22:03 -07:00
Felix
37298a7616 Merge "Add interface info to .rc files"
am: 98d0f4d52c

Change-Id: Ie6cfbacd523c4b09f77bee3369ec8e88b3fa0419
2019-07-08 12:22:23 -07:00
Jimmy Chen
d49f3424c5 Merge "p2p: skip MAC randomization vts test if not supported" into qt-dev
am: 33723f56b5

Change-Id: Ib6779515fb13d25b1f712f5bb32981a7980d79f4
2019-06-26 23:11:18 -07:00
Jimmy Chen
7af5384d2d p2p: skip MAC randomization vts test if not supported
Bug: 135247522
Test: atest VtsHalWifiSupplicantP2pV1_2TargetTest
Change-Id: I1aafcdbe88f93dbf73069d24ae90cad0d395df6e
2019-06-26 14:40:10 +08:00
Felix
551b8d15ce Add interface info to .rc files
Signed-off-by: Felix <google@ix5.org>
Change-Id: I6d70bbdb66c3dce280bf6908c3750316a6f6cf70
2019-06-25 20:00:07 +02:00
Josh Gao
a20a499819 Fix leaks in wifi_chip.cpp.
Use closedir on DIR*, instead of close(dirfd(DIR*)).

Bug: http://b/109702699
Test: mma
Change-Id: I827d3a414761bb836d5360221296823fcb34cd6b
Merged-In: I827d3a414761bb836d5360221296823fcb34cd6b
2019-06-20 12:49:14 -07:00
Steven Moreland
0dc5f389f9 Merge "libhidltransport users user libhidlbase" into qt-dev
am: a27c627f51

Change-Id: I379a04a52e60260e0a73dc7720d3e315038a52ff
2019-06-14 16:18:47 -07:00
Steven Moreland
085a82ecb1 libhidltransport users user libhidlbase
libhidltransport symbols are being moved into libhidlbase in order to
optimize linking/memory usage. libhidltransport will no longer be
required in the future (however removing references to it will come
separately).

Bug: 134961554
Test: boot
Change-Id: Ibcc2db32d3bec1a786b60e11d4820ecd0605f403
2019-06-12 13:49:19 -07:00
Nate Jiang
36e0b2aba9 Merge "[VTS][AWARE]Setting callbacktype type to invalid value before invoking HIDL call" into qt-dev
am: 1289d1fefa

Change-Id: I0aad72e050a780a4050ff53fe8aa7e03ccd56f08
2019-05-29 16:41:19 -07:00
Nate Jiang
18408a93d9 [VTS][AWARE]Setting callbacktype type to invalid value before invoking HIDL call
Avoid race condition between event callback and wait context. Make
callbacktype to invalid before call function to change it.

Test: atest VtsHalWifiNanV1_0TargetTest VtsHalWifiNanV1_2TargetTest
Bug: 133484330
Change-Id: I9211c3e172727f56d0cceaf91b98f8d5b3c7fc7e
2019-05-29 10:41:55 -07:00
James Mattis
dd12f40157 Merge "Fix so that dual access points (AP) works." into qt-dev
am: 87592de6f2

Change-Id: Ie2326fb0ed826db83c4c45d085331323ca88cf8c
2019-05-24 17:06:59 -07:00
James Mattis
87592de6f2 Merge "Fix so that dual access points (AP) works." into qt-dev 2019-05-24 23:21:37 +00:00
Roshan Pius
5007b34ea4 Merge "wifi(tests): Unit tests for iface event cb's" into qt-dev
am: 4ae7dd19ba

Change-Id: I92240fd5798fb9b9182064de68abbf3b362b4232
2019-05-23 23:44:49 -07:00
Roshan Pius
4ec7fceb44 Merge changes I760dc5ca,Ia2da1dcf into qt-dev
am: c733f3bbed

Change-Id: Ia86409c4cd80176c8f71b8a46c88024d0b68dd7d
2019-05-23 23:32:31 -07:00
James Mattis
d2e4c07465 Fix so that dual access points (AP) works.
Devices that only have dual AP setup without an STA were not working. A
use case for this would be in a car, having a wifi hotspot active while
also projecting to the car head unit from your phone. This was working
but a recent change in CL a3e5b7f that forced STA to be on wlan0 and AP to start at
wlan1 broke this functionality. This change is to augment the original
CL to keep it's function in place while also taking into
account devices that have dual AP.

Bug: 132268977
Test: Manual boot of hawk device along with testing of tethering and
local only hotspot.

Change-Id: I8da5dd4f0baea1bf0f22d3275e356936a58fb3d1
2019-05-22 16:26:55 -07:00
Roshan Pius
c885df0af3 wifi(tests): Unit tests for iface event cb's
Few class refactors to help with unit tests for ag/7567226.

Bug: 132943959
Test: ./hardware/interfaces/wifi/1.3/default/tests/runtests.sh
Change-Id: I62909f3f94899bc1593824684b93d29f44954eae
2019-05-22 14:22:01 -07:00
Roshan Pius
356d5a6ed2 wifi(implementation): Send NAN disabled on wlan0 down & up
When the iface state is toggled for MAC address change on the underlying
interface for NAN operations, send NAN disabled event up to the
framework. The iface down/up toggle resets all NAN operations in the
firmware. So, this callback should trigger a cleanup of any
operations initiated by the framework.

Bug: 132943959
Test: Unit tests in the follow-up CL.
Test: Will send for regression tests.
Change-Id: I760dc5ca3b9276956f5edd40a97c3c13811f442c
2019-05-22 14:11:16 -07:00
Roshan Pius
8236850bc0 wifi(implementation): Invalidate NAN iface on STA iface removal
NAN iface/RTT controllers are sharing the STA iface. When a STA iface is
removed, we should remove these dependent modules as well to ensure
proper cleanup.

Bug: 132837537
Test: ./hardware/interfaces/wifi/1.3/default/tests/runtests.sh
Test: Will send for regression tests.
Change-Id: Ia2da1dcf66b388f54e916ae69e2f4e26f20ecfad
2019-05-17 15:23:09 -07:00
hayun.kim
ec881dd0ad Fix VtsHalWifiV1_0Host#WifiStaIfaceHidlTest.SetScanningMacOui fail am: eb73bff276 am: 4808395767
am: 43ab18edcb

Change-Id: I7460a5732720694bf5d9c6b564086b54fccbdba6
2019-04-23 16:15:05 -07:00
hayun.kim
43ab18edcb Fix VtsHalWifiV1_0Host#WifiStaIfaceHidlTest.SetScanningMacOui fail am: eb73bff276
am: 4808395767

Change-Id: I9e4ecfdcda7988725bc2c85703c26d7a38f72f56
2019-04-23 15:49:56 -07:00
Roshan Pius
1b1f97f02a Merge "wifi(implementation): Simplify getFirstActiveWlanIfaceName" into qt-dev
am: 2f40bd0697

Change-Id: Ib9dd24c964586230a81dda08d4844d0d06733183
2019-04-22 23:29:10 -07:00
TreeHugger Robot
2f40bd0697 Merge "wifi(implementation): Simplify getFirstActiveWlanIfaceName" into qt-dev 2019-04-23 06:14:19 +00:00
Roshan Pius
444473fbc0 wifi(implementation): Simplify getFirstActiveWlanIfaceName
Get rid of the unnecessary looping inside the method which was causing a
bunch of unnecessary selinux denial logs.

Bug: 130384921
Test: ./data/android.hardware.wifi@1.0-service-tests
Test: Manually verified the property name after wifi on/off & softap
on/off.

Change-Id: Ia9f61749b2017234851d67b027deb685cb8b539e
2019-04-22 08:58:46 -07:00
lesl
d78f1c2713 Merge "hostapd: fix hostapd vts fail" into qt-dev
am: 2684365a73

Change-Id: Ibcad2d2c33cd5737631359491f9ea9ea08d6a1e8
2019-04-20 00:26:42 -07:00
TreeHugger Robot
2684365a73 Merge "hostapd: fix hostapd vts fail" into qt-dev 2019-04-20 07:13:24 +00:00
Steven Moreland
99712c08cc Update hidl makefiles for bpfmt
hidl-generated makefiles are now generated such that bpfmt(file) == file.

Bug: 67417008
Test: enable bpfmt hook
Change-Id: I53e5bf67a0d314e1b10c0ba0c7172a7af358ddcc
2019-04-18 18:13:05 -07:00
Steven Moreland
6d494b2346 Merge "Update hidl makefiles for bpfmt" am: ff0bd741ca
am: 96f40f7b02

Change-Id: Idbf030e4993067bdb8181321bca2de00c9b6f7ef
2019-04-18 14:34:45 -07:00
Steven Moreland
96f40f7b02 Merge "Update hidl makefiles for bpfmt"
am: ff0bd741ca

Change-Id: Icd0e90c12952f2471416986451cce7eebb6856af
2019-04-18 14:21:43 -07:00
lesl
ce4a7cce2c hostapd: fix hostapd vts fail
If wpa_supplicant is running during hostapd vts and there are some
configuration in wpa_supplicant. It will happen both of hostapd and
wpa_supplicant are working with wlan0 interface.

Stop wpa_supplicant before running hostapd vts.

Reproduce step:
1. Connect to Wifi before execute hostapd vts.
2. Run hostapd vts.

Bug: 130207248
Test: vts with below commands
vts-tradefed run commandAndExit vts-hal --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalWifiHostapdV1_0Target -l INFO
vts-tradefed run commandAndExit vts-hal --skip-all-system-status-check --primary-abi-only --skip-preconditions --module VtsHalWifiHostapdV1_1Target -l INFO

Change-Id: Id91463c2eab3c8c348a91bd978d7ea4aa8d42e85
2019-04-18 10:18:22 +08:00