Commit graph

565 commits

Author SHA1 Message Date
Etan Cohen
e262f8cecd Merge "[AWARE] Update cm HIDL to use mm HAL" 2017-12-15 16:53:50 +00:00
Roshan Pius
220d98c193 Merge changes I017d3528,Ie5444041,Iff873784,I1049176a,I8575df02, ...
* changes:
  wifi(implementation): Load wifi driver on IWifi.start()
  wifi(implementation): Different names for concurrent ifaces
  wifi(implementation): Add iface combo for 2018
  wifi(implementation): Unit tests for V1 & V2 iface combos
  wifi(implementation): Add unit test framework
  wifi(implementation): Support multiple ifaces of same type
2017-12-15 04:02:13 +00:00
Etan Cohen
7b8c5d78c8 [AWARE] Update cm HIDL to use mm HAL
Legacy HAL updated to use mm. The current HIDL is (still at) cm.
Add conversions.

Bug: 69428593
Test: integration tests passing (but ranging is still pending fw)
Change-Id: Ia431fcebedf5a1c66847c2f1627923b5704fece0
2017-12-14 18:12:04 -08:00
Etan Cohen
d4020eaa27 Merge "[AWARE] Add legacy code wrapper for NDP channel indication" 2017-12-13 18:38:05 +00:00
Roshan Pius
8fc6d17071 wifi(implementation): Load wifi driver on IWifi.start()
The current implementation loads the wifi driver only when the chip is
configured, but the HAL is initialized on IWifi.start(). This seems to
be wrong semantically. The driver needs to be loaded before the HAL is
initialized.

This may have worked previously because the driver was loaded in
init.rc, but may stop working when we move to proper DLKM model in 2018.

Bug: 65671875
Test: Device boots up and connects to wifi networks.
Change-Id: I017d3528bf0b42a6a59af43203ecc9d0d027f60d
2017-12-13 10:35:50 -08:00
Roshan Pius
8e3c7ef134 wifi(implementation): Different names for concurrent ifaces
Allocate different iface names (wlan0, wlan1) for concurrent ifaces.

Bug: 65671875
Test: ./hardware/interfaces/wifi/1.2/default/tests/runtests.sh
Change-Id: Ie544404183dbb616a20f88f4fb3ce71795cf89af
2017-12-13 10:35:50 -08:00
Roshan Pius
cc338202ef wifi(implementation): Add iface combo for 2018
Changes in the CL:
a) Added iface combo for 2018 using a new feature flag.
b) Added a generic algorithm to determine if an iface can be created or
not based on the iface combos supported. This is needed because we now
have to support 3 different combos (2016, 2017, 2018) in the HAL.
The current iface creation logic is hard to adapt to these 3 varying combos.

Bug: 65671875
Bug: 69863101
Test: ./hardware/interfaces/wifi/1.2/default/tests/runtests.sh
Change-Id: Iff8737843abee3d03567930e9faba775eaa82e07
2017-12-13 10:35:50 -08:00
Roshan Pius
3312801aa5 wifi(implementation): Unit tests for V1 & V2 iface combos
Unit tests for all the iface combos supported in V1 (2016 devices) & V2
(2017 devices).

Bug: 68775880
Test: ./hardware/interfaces/wifi/1.2/default/tests/runtests.sh
Change-Id: I1049176aabdf936d442d022b5915129010ce7387
2017-12-13 10:35:37 -08:00
Etan Cohen
1bf15f1c57 [AWARE] Add legacy code wrapper for NDP channel indication
Integrate legacy HAL code mods to add an NDP channel indication.

Note: This CL is just the integration - not the HIDL usage of the
new API.

Bug: 37007030
Test: builds + integration tests passing
Change-Id: I59da1fb7e225a5038e436b793bc66b892786c238
2017-12-12 16:15:16 -08:00
Roshan Pius
200a17db77 wifi(implementation): Add unit test framework
We're going to add some non-trivial logic in wifi chip to handle
multiple chip configurations (to support devices with different
capabilities). So, adding a unit test framework in preparation
for testing those changes.

The mocks only mock legacy HAL methods which are in use during chip
configuration & interface creation/deletion.

Bug: 68775880
Test: Compiles
Change-Id: I8575df02f54656f77077d14ac9535ccc974bdff3
2017-12-12 15:01:15 -08:00
Roshan Pius
675609baa6 wifi(implementation): Support multiple ifaces of same type
Making all of the iface object fields in WifiChip to vectors to support
multiple ifaces of the same type.

Bug: 65671875
Test: Device boots up and connects to wifi networks.
Change-Id: I4c0c927c0269e54210cc1f81203c1797d72e969c
2017-12-12 15:01:15 -08:00
Roshan Pius
ba38d9ce76 wifi(implementation): Allow chip reconfiguration
This was previously disallowed because WifiLegacyHal.stop() was non blocking.
WifiLegacyHal.stop() was made blocking using ag/2715673, so reconfiguration
should be supportable now.
Note: This is a partial revert of ag/2125543.

Bug: 65671875
Bug: 70411703
Test: Will send for regression tests.
Test: Reverted the VTS CL: ag/2139830 and ensured that the test works
now. Can't check-in that revert because it would not be backward
compatible.
Change-Id: Ia5f9ccaf5403d171b0def7740d2adece7eb3c157
2017-12-11 23:47:43 +00:00
Roshan Pius
abcf78fe90 wifi(implementation): Fix formatting
Use the top level clang-format setup by the HIDL team to format the
entire implementation.

clang-format -i --style file wifi/1.2/default/*

Bug: 32287573
Test: Compiles
Change-Id: I336c21fd9bfdc560117aa7212f92ab5f01df4b8e
2017-12-04 08:14:11 -08:00
Roshan Pius
acededbcd1 wifi(implementation): Dual interface support
Add support for concurrent interfaces in the WifiLegacyHal class:
a) Removed the hardcoded "wlan0" interface handle in WifiLegacyHal.
b) Modified all the interface specific functions to accept the |iface_name|
argument on which the operation needs to be performed.

Each IWifiIface object will hold the name of the underlying network
interface (wlan0, wlan1 or p2p0) which it is representing.
All IWifiChip operations which needs an iface name will continue to use
the default "wlan0".

Bug: 65671875
Test: Device boots up and connects to wifi networks.
Test: Will send for regression tests.
Change-Id: I9bd9c2a9ba33ac1ea5677fc5d7c261d8eac08e1d
2017-12-04 08:14:11 -08:00
Roshan Pius
9377a0d285 wifi(implementation): Use real iface names
Currently the HAL shim uses fake names to ensure that each type of
IWifiIface has a unique name. This is not a true reflection of the
network interfaces exposed by the wifi driver. So, change the HIDL shim
to use the corresponding interfaces names.

IWifiStaIface, IWifiApIface & IWifiNanIface all use the same "wlan0"
network interface.
IWifiP2pIface uses the "p2p0" network interface.

In the future, we'll be extending this to create a second IWifiStaIface
or IWifiApIface using "wlan1" network interface.

IWifiRttController does not need to be associated with an iface object.
So, it will just default to using "wlan0" always.
TODO(b/34702983): Need to deprecate the bound iface from the HIDL interface.

Bug: 65671875
Test: Device boots up and connects to wifi networks.
Test: Will send for regression tests.
Change-Id: I33fef1332f2fe2da3f48ee87ef06660844699253
2017-12-04 08:14:11 -08:00
Steven Moreland
fcca4e23b7 Remove subdirs
Removing whenever I see these in code reviews.

Test: none
Merged-In: I4322f533a837d55618ec2ed2125e8966ace9d61d
Change-Id: I4322f533a837d55618ec2ed2125e8966ace9d61d
2017-11-28 14:22:43 -08:00
Roshan Pius
f9c174415e Merge "wifi(vts): Ignore HAL stop failure" into oc-mr1-dev am: 436ca9240e
am: e141301cbb

Change-Id: I18782f03b47696e9f384b1ed035f3f527d8f60f5
2017-11-20 20:36:27 +00:00
Roshan Pius
e141301cbb Merge "wifi(vts): Ignore HAL stop failure" into oc-mr1-dev
am: 436ca9240e

Change-Id: I7763cb156d3d4b9e041664c4bdeae5a03962250d
2017-11-20 20:32:56 +00:00
Roshan Pius
2d6676a1ce wifi(vts): Ignore HAL stop failure
The stop may fail if the interface down operation takes too long on some
devices. This is not fatal as long as we're able to bring up the
interfae for the next HAL start.

Bug: 68303248
Test: VTS tests
Change-Id: I93943f9d0cfb83cf07253c6f9b3866d6d137028f
2017-11-17 11:02:38 -08:00
Roshan Pius
571ff97f50 wifi(vts): Skip tests if feature not supported am: fbe5aff5e4 am: 405f2869bc
am: b6805fda2a

Change-Id: I99c1dc87f929df19f1e43cd6428a4c0153adaad6
2017-11-16 18:30:23 +00:00
Roshan Pius
b6805fda2a wifi(vts): Skip tests if feature not supported am: fbe5aff5e4
am: 405f2869bc

Change-Id: I73778baa541537f58a7dc002099e551e8ab3ce7e
2017-11-16 18:28:24 +00:00
Roshan Pius
405f2869bc wifi(vts): Skip tests if feature not supported
am: fbe5aff5e4

Change-Id: I8c87bfff60c4964a5ab99da961f166a8e86ee81e
2017-11-16 18:26:21 +00:00
Roshan Pius
fbe5aff5e4 wifi(vts): Skip tests if feature not supported
Bug: 69338713
Test: `make vts -j30 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 &&
vts-tradefed run commandAndExit vts --skip-all-system-status-check
--primary-abi-only --skip-preconditions --module VtsHalWifiV1_0Target -l
INFO`
Change-Id: If70050811ce87f8eff32696ecdd4d3f49646bad0
2017-11-15 13:36:47 -08:00
Xin Li
bb9e38fef9 Merge commit '1a06284b24f5eb7bb9c1fea0817da8898b3b1bff' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I2a044eb8c9981d0a8198ffe2df55559afbd76341
Merged-In: I4fb9f18884f7ef21162015a0032c4431444f7025
2017-11-14 12:08:38 -08:00
TreeHugger Robot
75b8428b4c Merge "resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp 2017-11-14 11:00:56 +00:00
Martijn Coenen
3092f98101 resolve merge conflicts of 32ba3eaa to oc-mr1-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I731eba80656edbf87a5d5ba3af63a2c607ac61a6
Merged-In: Id71e2348eabf5101d1fd286bbc0076154703d159
2017-11-14 08:37:32 +00:00
Martijn Coenen
cf426f0fea Fix library loading order in .mk files.
Test: angler boots again
Bug: 69180318
Change-Id: Id71e2348eabf5101d1fd286bbc0076154703d159
Merged-In: Id71e2348eabf5101d1fd286bbc0076154703d159
2017-11-13 20:42:40 +00:00
TreeHugger Robot
91d263d6a9 Merge "Fix library loading order in .mk files." 2017-11-13 20:40:38 +00:00
Steven Moreland
c2f829a1d2 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 11:39:07 -08:00
Martijn Coenen
b6fa3ae638 Fix library loading order in .mk files.
Test: angler boots again
Bug: 69180318
Change-Id: Id71e2348eabf5101d1fd286bbc0076154703d159
2017-11-13 19:59:54 +01:00
Steven Moreland
8db261bc99 Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
2017-11-13 10:00:18 -08:00
Etan Cohen
afe3bbdc53 [VTS][NAN] Fix VTS tests: didn't abort early enough for non-NAN devices am: 1acc63f9cf
am: ba01f8ff7a

Change-Id: I3a85c77d662d9225a05214380d9544115f1351bd
2017-11-10 22:05:28 +00:00
Etan Cohen
ba01f8ff7a [VTS][NAN] Fix VTS tests: didn't abort early enough for non-NAN devices
am: 1acc63f9cf

Change-Id: I7d306db29ebc8092e8e6bd99dd4836d457433b15
2017-11-10 22:03:18 +00:00
Etan Cohen
1acc63f9cf [VTS][NAN] Fix VTS tests: didn't abort early enough for non-NAN devices
The NAN-specific VTS tests check whether the device supports NAN.
However, the tests did not abort early enough.

Bug: 68302113
Test: builds
Change-Id: Ie6fb0e2b0bd12840ce6bc52fab1b6d4e8c5a571e
2017-11-10 10:41:51 -08:00
Steven Moreland
a1169dd600 Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
2017-11-10 09:06:55 -08:00
Steven Moreland
726af41e68 resolve merge conflicts of dd5206c57 to oc-mr1-dev-plus-aosp
This version of configstore was removed internally.

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I589addff6aec7bb7a8a7938d75c51dcc56116a42
2017-11-02 20:59:39 +00:00
Treehugger Robot
9d4c21f9af Merge "Update makefiles after AOSP push." 2017-11-02 20:39:30 +00:00
Steven Moreland
db3c6b747f Merge "Remove unnecessary Android.mk" am: 7052f3d45d am: 6993933fc6
am: 0d6bbbcc1e

Change-Id: I23bd6e6751db2aac43904e7aa0c0d9c6661a96d1
2017-11-02 04:26:19 +00:00
Steven Moreland
0d6bbbcc1e Merge "Remove unnecessary Android.mk" am: 7052f3d45d
am: 6993933fc6

Change-Id: Id4f1fcb632a25a7a44b04c44eacd3f089cd1e8ca
2017-11-02 04:24:48 +00:00
Steven Moreland
822c2e1809 Remove unnecessary Android.mk
Doesn't do anything. Just when I thought I get rid of them all.

Test: none
Change-Id: Iac559e41ea5557e99490fa439af9d720e2d9075a
2017-11-01 16:44:44 -07:00
Steven Moreland
c5bc4c7cbb Update makefiles after AOSP push.
Test: none
Change-Id: If3ce74f4d2250d33820cbd864ff56bba6f9e6b67
2017-11-01 16:42:15 -07:00
Steven Moreland
f390f03aa4 Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
2017-10-11 18:30:28 +00:00
Steven Moreland
1d7374c5e1 Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1 am: 6c811964a1
am: 116161d94e

Change-Id: I33643636e2511de77fdf7de57777eb67edee2e52
2017-10-11 16:39:21 +00:00
Steven Moreland
116161d94e Update for Soong java makefiles. am: c3e80fa01e am: 0fff75dee1
am: 6c811964a1

Change-Id: I85ccbb4a15cd18938607f5bca4e065b9d7e0182b
2017-10-11 16:31:07 +00:00
Steven Moreland
0fff75dee1 Update for Soong java makefiles.
am: c3e80fa01e

Change-Id: Ia8835f9c95bd98a96f5fd3aff11191e7d3726fb9
2017-10-11 16:23:54 +00:00
Steven Moreland
c3e80fa01e Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
2017-10-10 23:07:20 +00:00
Roshan Pius
a6489738b9 supplicant(interface): Uprev to 1.1
Bug: 65673412
Test: Device boots up and connects to wifi networks.
Change-Id: Ide9ee6292252116fe7db7f48d1e54716bf24b569
2017-10-05 10:36:48 -07:00
Steven Moreland
70bfb9d250 Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f am: b53e6ad535
am: 9a17f41f6f

Change-Id: I78d9292068b372238554fd9d35128e69f5b5f9d2
2017-10-04 21:54:11 +00:00
Steven Moreland
9a17f41f6f Merge "Update for hidl adapter module defaults." am: 988c977079 am: 861651985f
am: b53e6ad535

Change-Id: I23269fb7a9bdd352e670a80f390527d9eef31412
2017-10-04 21:51:00 +00:00
Steven Moreland
861651985f Merge "Update for hidl adapter module defaults."
am: 988c977079

Change-Id: I289818be1b30397391847ba1c532d1014fdbed27
2017-10-04 21:45:09 +00:00