Commit graph

36 commits

Author SHA1 Message Date
Tom Cherry
964fbf37a9 Add capabilities to wifi HAL service
Bug: 74554159
Test: wifi works on walleye
Merged-In: Ia6784e78a7faec914cbbecbe84800c4fbe46c00b
Change-Id: I8deb730bbd9cb473d68ffc696b31031abf617eec
2018-03-26 16:09:13 +00:00
Zhuoyao Zhang
308f153eeb Convert wifi hal test to use VtsHalHidlTargetTestEnvBase
Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalWifiV1_0Host
      vts-tradefed run vts -m VtsHalWifiV1_1Target
      vts-tradefed run vts -m VtsHalWifiSupplicantV1_0Target
      vts-tradefed run vts -m VtsHalWifiSupplicantV1_1Target

Change-Id: I4ea9554829b75b73b600ab668885d57c94251a87
Merged-In: I4ea9554829b75b73b600ab668885d57c94251a87
(cherry picked from commit e768fb9cea)
2018-02-14 13:25:34 -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
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
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
c5bc4c7cbb Update makefiles after AOSP push.
Test: none
Change-Id: If3ce74f4d2250d33820cbd864ff56bba6f9e6b67
2017-11-01 16:42:15 -07:00
Roshan Pius
b537ec5d6f Merge "wifi(implementation): Increase stop timeout" into oc-mr1-dev
am: 558d53cc61

Change-Id: I806ac9ce69cada0a26e481bd121742ddbcf6f4b0
2017-10-03 23:49:11 +00:00
Roshan Pius
9bd4e6bfc7 wifi(implementation): Increase stop timeout
The current timeout of 50ms seems to be insufficient on some devices.
So, changing it to a higher value.

Bug: 66334487
Test:  Ran the VTS tests continously in a loop for 30 minutes
without failure. Previously, failure occurence was about once every
5-10 minutes.
`while adb shell /data/VtsHalWifiSupplicantV1_0TargetTest; do :;
done; adb bugreport`

Change-Id: I884de64d748b46b9710a702f3c72cc30dd51627e
2017-09-29 15:10:21 -07:00
Roshan Pius
d956fb10e5 Merge "wifi(implementation): Remove unnecessary local variable" into oc-mr1-dev
am: 12d6df4a2a

Change-Id: Id89af05cf256af7b4a6958c502a7f8a683901084
2017-09-05 22:53:56 +00:00
Roshan Pius
e94d036f4f Merge "wifi(implementation): Make WifiLegacyHal.stop() blocking" into oc-mr1-dev
am: ac2cd9e8ea

Change-Id: Ic20beb0fe4cd08c8e631ea170d8e6a85dbaac5ce
2017-09-05 22:53:26 +00:00
Roshan Pius
3078a4cb67 wifi(implementation): Remove unnecessary local variable
Bug: 65058323
Test: Compiles
Change-Id: Ib268234837f5b381572c8038e7900a145fb32249
2017-08-28 16:14:22 -07:00
Roshan Pius
155344b866 wifi(implementation): Make WifiLegacyHal.stop() blocking
IWifi::stop() is currently non-blocking which makes it hard for the
client to determing when the stop is fully complete. This for example
causes wificond to disable the wlan0 interface while the legacy HAL
stop is being processed. So, add a timed wait to let the legacy HAL
complete processing of the stop before we unblock the IWifi::stop()
HIDL call.

Bug: 64611487
Test: Manual tests by wifi state toggling and verifying the order of
events in logs:
08-15 19:17:53.302   796   796 I android.hardware.wifi@1.0-service:
Stopping legacy HAL
08-15 19:17:53.302   796   796 I WifiHAL : Sent msg on exit sock to
unblock poll()
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
host_logs, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
fw_logs, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
per_pkt_stats, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
diag_events, errno: 0 id: -2
08-15 19:17:53.302   796  4793 E CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Could not find group
fatal_events, errno: 0 id: -2
08-15 19:17:53.302   796  4793 I CLD80211:
/vendor/bin/hw/android.hardware.wifi@1.0-service: Sent msg on exit sock
to unblock poll()
08-15 19:17:53.302   796  4793 I android.hardware.wifi@1.0-service:
Legacy HAL stop complete callback received
08-15 19:17:53.304   802   838 D CHRE    : @ 151.328: [Platform] wifi:
has 0, enabled 0
08-15 19:17:53.321   796  4793 I android.hardware.wifi@1.0-service:
Legacy HAL event loop terminated
08-15 19:17:53.321   796   796 I android.hardware.wifi@1.0-service:
Legacy HAL stop complete
08-15 19:17:53.522   796   796 I android.hardware.wifi@1.0-service: Wifi
HAL stopped

Test: Will send for regression tests.
Change-Id: I394c11724e9459a4b9a6b970e2bcb4e0ad65fefc
2017-08-28 12:55:07 -07:00
Roshan Pius
0369531e0f Merge "wifi(implementation): Reduce logging severity" into oc-mr1-dev
am: c0e5e08634

Change-Id: I1603f227ab8a10268a41da51c59f0dc3cbec5634
2017-08-15 22:33:07 +00:00
Roshan Pius
d6ce826894 wifi(implementation): Reduce logging severity
IE elements should not be present in the batched scan results, but it
being there doesn't cause any problems. The IE elements will be ignored
when we send it over the HIDL interface, so reduce the log level to
prevent log spamming.

Bug: 64448186
Test: None
Change-Id: Ia0d0312a113c907bb0992bb8f41e734fe9d05114
2017-08-15 08:42:50 -07:00
Steven Moreland
4f25c2a143 Revert "Revert "Updating all makefiles.""
Relanding without automotive/vehicle/2.0+2.1 changes.

This reverts commit 1020ebedfb.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: Icc49df42c2bedf443d878d5d8fbaa53441ea65db
2017-08-11 23:02:01 +00:00
Steven Moreland
ff308ea6ba Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Merged-In: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
Change-Id: Ifdc3c17cb2b85c18b37dac2d03bb5c8935c23180
2017-08-11 22:58:47 +00:00
Steven Moreland
1020ebedfb Revert "Updating all makefiles."
This reverts commit 8ac1971678.

Reason for revert: Didn't remove automotive changes from this CL.

Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
2017-08-11 22:56:56 +00:00
Steven Moreland
8ac1971678 Updating all makefiles.
Bug: 64487114
Test: none
Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a
Change-Id: I2fa89b6661c39859ec4fb62c4bb0a05a35e645f0
2017-08-10 22:40:04 +00:00
Tri Vo
2883486706 Merge "VTS tests now static link to HAL def libs. #2" into oc-mr1-dev 2017-08-10 17:45:07 +00:00
Tri Vo
0c2ce357b1 VTS tests now static link to HAL def libs. #2
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: crop out all non-affected tests from vts-hal-hidl.xml and run
vts-tradefed run commandAndExit vts-hal-hidl --skip-all-system-status-check 
--skip-preconditions
2 failures, same as without this change:
GatekeeperHidlTest.DeleteAllUsersTest
GatekeeperHidlTest.DeleteUserTest

Change-Id: I8f6995e9536a9aefe283ee3effec9f5a7f03b620
2017-08-10 17:44:57 +00:00
Roshan Pius
07bac60f31 wifi(vts): Ignore IWifi.stop() returning ERROR_NOT_AVAILABLE
am: 8c216524a3

Change-Id: I1bf9be99d4e673209edb893040483bf772ee3ca0
2017-08-08 17:10:25 +00:00
Roshan Pius
8c216524a3 wifi(vts): Ignore IWifi.stop() returning ERROR_NOT_AVAILABLE
When IWifi.stop() is invoked back to back (happens in the ConfigureChip
vts test), the HAL would return ERROR_NOT_AVAILABLE if the previous stop
is still being processed. This is not an error that needs to fail the test,
but a legitimate status for stop. We have a retry mechanism to handle
this in both the VTS test and framework for the case where IWifi.start()
is invoked while the previous stop is being processed.

While there, corrected a few log messages emitted by the HAL to debug
such startup/stop issues better.

Bug: 63971806
Test: `vts-tradefed run commandAndExit vts --skip-all-system-status-check
--primary-abi-only --skip-preconditions --module VtsHalWifiV1_0Target -l
INFO`

Change-Id: I5e3470ac97541a6ea10aceec9b737e5d03ed5206
2017-08-08 17:02:19 +00:00
Justin Yun
608d773ef8 Update make file for vndk enabled.
Update the Android.bp generated with hidl-gen.

Test: build with and without BOARD_VNDK_VERSION=current
Bug: 63866913
Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2017-08-04 14:12:23 +09:00
Tri Vo
f5d136c231 Update Android.bp HIDL makefiles
Allow HAL definition libs to be static.

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2017-08-03 00:30:01 +00:00
Roshan Pius
82396e9e1b Merge "wifi(hidl): Modify the SAR power levels interface" into oc-dr1-dev
am: dda74bcf77

Change-Id: I504fe9096b855c6270c50c1e46b4e5ee26b9ea67
2017-07-28 02:51:57 +00:00
Roshan Pius
735ff43197 wifi(hidl): Modify the SAR power levels interface
Modifying the interface used to lower the tx power level for meeting SAR
requirements based on recommendation from the nexus hardware team. The
previous interface passed in a single power value in dBm for meeting SAR
requirements. However, the SAR requirements are more complex than that.
Based on the connection mode (802.11 a,b,g,n,ac) and the number of
streams that are active (MIMO), the SAR power levels are very
different. Using the previous interface would mean that we will have to
use the lowest power level among all the connection modes to meet the SAR
requirements. This would however result in us lowering the power much
more than needed (~2 dBm) for many connection modes.
Instead, we're switching to a more generic interface where the framework
informs the wifi chip that we're entering a special tx power mode scenario
(today, there is only 1 for voice call). The chip can then lookup the
extensive table of power levels for different connection modes which are
pre-populated by the OEM's in the BDF file to set the power level (depending
on the scenario framework sends and the active connection mode).

Bug: 62437848
Test: Manual tests
Change-Id: I5ee3f0d2c130958dbeb352e3b5ad9407f432624f
2017-07-27 14:05:03 -07:00
TreeHugger Robot
5115ed5268 Merge "wifi: Add owners" into oc-mr1-dev 2017-07-21 02:54:15 +00:00
Roshan Pius
1d047a7539 wifi: Add owners
Change-Id: If5a9a7da36b86f968bd32768d61e5d181573d30a
2017-07-20 14:39:29 -07:00
Etan Cohen
f26f9266c3 [HAL] Invalidate chip before shutting down legacy HAL
Change the order of shutdown to invalidate chips before
shutting down the legacy HAL. Allows pre-shutdown commands
to be sent down.

Bug: 63704506
Test: NAN tests passing
Test: full regression suite
Change-Id: I03d237d732b4e3482b1e1639848342dfdde9fcb7
2017-07-20 14:04:07 +00:00
Etan Cohen
a0c6d7d5c6 [HAL] Invalidate chip before shutting down legacy HAL
Change the order of shutdown to invalidate chips before
shutting down the legacy HAL. Allows pre-shutdown commands
to be sent down.

Bug: 63704506
Test: NAN tests passing
Test: full regression suite
Change-Id: I03d237d732b4e3482b1e1639848342dfdde9fcb7
2017-07-19 19:31:12 +00:00
TreeHugger Robot
b3ea84438b Merge "wifi: Add the missing RTT capabilities" into oc-dr1-dev 2017-07-18 23:04:26 +00:00
Etan Cohen
b14c7560f7 [VTS][NAN] Restore NAN test: configure for device support
Restore NAN test and use configuration which determines test
result based on whether or not the platform supports NAN.

Bug: 63131342
Test: NAN-supporting devices: pass (the NAN tests)
Test: Non-NAN-supporting device: pass
Change-Id: I6600abc531d4eb1dea6c501f6a39ef37051cb923
2017-07-18 10:52:10 -07:00
Roshan Pius
08df76ec0d wifi: Add the missing RTT capabilities
These feature flags are defined in the legacy HAL, but were not exposed in the HIDL
interface.

Updated the hash in current.txt using 'hidl-gen -L hash -r
android.hardware.wifi@1.1:hardware/interfaces -r
android.hardware:hardware/interfaces -r
android.hidl:system/libhidl/transport
android.hardware.wifi@1.1::IWifiChip'

Bug: 63545934
Test: Manual testing
Change-Id: Ia196e0fc1c5e305210ec95eb8a54b1a1204ebf20
2017-07-17 13:21:23 -07:00
Roshan Pius
8184d210d2 wifi(implementation): Set/Reset TX power limit
Hookup the HIDL method calls to the respective newly added legacy
HAL functions for setting/resetting TX power limits for SAR
requirements.

Bug: 62437848
Test: VTS test fails because of a bug in Qcom implementation. Working
with Qcom to fix their implementation.
Change-Id: Ia619f5558e44d44fd77d037e72dfc1f6863b51e0
2017-07-11 14:03:06 -07:00
Roshan Pius
dbd83ef585 wifi(implementation): Create 1.1 interface package
1. Move the implementation in 1.0/default to 1.1/default.
2. Move all of the implementation to
android::hardware::V1_1::implementation namespace.
3. All of the header files include the android::hardware::V1_0 namespace
so that it can access the types from 1.0 package. ("using namespace" is
against Google style guide though :().
The other option to prefix each 1.0 type with the namespace name.
For example: V1_0::WifiStatus.
4. Added the implementation of the new 1.1 method
IWifiChip.setTxPowerLimit().
4. The executable name and the .rc still has 1.0 name in it to avoid
changing all the device.mk files.

TODO: Hookup to the new legacy HAL API.

Bug: 62437848
Test: mmm -j128 hardware/interfaces/wifi/1.1/default/
Test: Device boots up and able to connect to wifi networks.
Test: New VTS tests passes
Change-Id: Ib36282939e70b064f246041a03d8870f5cb6410e
2017-07-06 19:44:33 +00:00
Roshan Pius
ee3daf9ab6 wifi(interface): Create 1.1 interface package
Extend the wifi HAL to add a new method in IWifiChip. This new method is
used for setting the TX power limit for meeting SAR requirements.

Bug: 62437848
Test: ./hardware/interfaces/update-makefiles.sh
Test: mmm -j32 hardware/interfaces/wifi/1.1
Change-Id: I8320a64812339f15cd88636505de0dfda18f0ebf
2017-07-06 09:19:25 -07:00