Commit graph

262 commits

Author SHA1 Message Date
Steven Moreland
5e59402492 Update makefiles for vndk enabled.
Test: none
Bug: 63866913
Merged-In: I29174fdadca2828455ef49f14e53bc95c5238dbb
Change-Id: I29174fdadca2828455ef49f14e53bc95c5238dbb
(cherry picked from commit c716b8c307)
2017-08-08 17:09:10 +09:00
Steven Moreland
f4c58cd48c Merge changes from topic 'go-away-static-hidl-java'
* changes:
  Update makefiles.
  Add an empty 1.1 ISap interface.
  [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
2017-08-04 19:14:48 +00:00
Steven Moreland
b5da32c177 Update makefiles.
Removes redundant "java-static" target.

Note, targets aren't removed here which have internal
targets that depend on them.

Bug: 36376126
Test: pass
Change-Id: I830f02e5f219d2d58721132c358d2783c3942eac
2017-08-03 15:25:21 -07:00
Etan Cohen
e2cc4c4f80 [AWARE] Fix validity check on PMK + export PASSPHRASE lengths
Bug: 62376042
Bug: 36376126
Test: unit tests + integrated (sl4a) tests
Change-Id: I90de33a36bdfdd746710b0c5b0e25458fe3c06c7
Merged-In: I4c0e19a21a268fe7f2d38e82f3743ac5a8e2c6cb
2017-08-03 15:20:24 -07:00
Treehugger Robot
7d149a564f Merge changes from topic 'vts_deps'
* changes:
  VTS tests now static link to HAL def libs.
  Add cc_defaults VtsHalTargetTestDefaults
2017-08-03 20:06:15 +00:00
Tri Vo
6c2bd86f70 VTS tests now static link to HAL def libs.
And use VtsHalTargetTestDefaults.

Bug: 64040096
Test: compiles
Change-Id: I3cfb1a64f6abcf3145337a736800b72d92a0b152
2017-08-03 18:04:00 +00:00
Sundong Ahn
94293086f8 Change dependency library
hwbinder.jar will be used instead of framework.jar on build-time, but
on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework.

Bug: 35771640
Test: no test.
Change-Id: I04cab676c91d2ea423f5e2c1b2b9efa15e522f37
2017-08-01 11:24:01 +09:00
Steven Moreland
7206708528 Update HIDL makefiles.
Allow them to be static.

This is required for a couple of reasons:
- enabling HIDL passthrough in recovery
- enabling VTS tests to be static blobs

Bug: 32920003
Bug: 64040096
Test: update-all-google-makefiles.sh
Change-Id: I1b2401fb273ab80819e3870aa71fe742269674ba
2017-07-26 10:14:57 -07:00
Treehugger Robot
9119d4ccd1 Merge "Update makefiles." 2017-05-20 00:05:51 +00:00
Etan Cohen
294340e1d4 Merge "[WIFI] Remove dependency on vendor-specific library" 2017-05-19 15:52:21 +00:00
Steven Moreland
06c85d986a Update makefiles.
Adds default configuration to all hals.

Test: pass
Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856
2017-05-18 16:14:16 -07:00
Steven Moreland
cb360c60d8 Update makefiles for c++-sources and c++-headers.
Test: pass
Bug: 38174080
Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601
2017-05-09 14:34:19 -07:00
Etan Cohen
d810874948 [WIFI] Remove dependency on vendor-specific library
The libcld80211 is vendor-specific. Remove from dependecy list.

(cherry-pick of commit aa281aa266)

Bug: 37901207
Test: builds and runs
Merged-In: If251002c2dd7a0e30ca18620edd905a63217f28a
Change-Id: If251002c2dd7a0e30ca18620edd905a63217f28a
2017-05-09 13:55:36 -07:00
Steven Moreland
ee1d248ae2 Remove redundant dependencies
android.hidl.base@1.0 and android.hidlmanager@1.0 are built into libhidltransport.

Test: links
Bug: 33276472
Change-Id: I424371932af129bba9d58dcf8652c64297f35f05
2017-05-01 09:47:58 -07:00
Treehugger Robot
f37bea87e8 Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" 2017-04-14 03:24:07 +00:00
Ningyuan Wang
b0bb01d808 wifi(interface): Add links to APF docs
Bug: 32119512
Test: Compiles
Merged-In: Iadb68a2a649b120b607735e4d88617b11740832f
Change-Id: I32ec491983d1d9e987a19a00b4fd8e60503c9e7f
2017-04-13 15:28:44 -07:00
Andreas Huber
6733baff6c Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I177f4cfd42f635aaf096107af8309d1a82ed41c0
Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
2017-04-13 15:16:27 -07:00
Steven Moreland
0dd5ba23fb Update makefiles.
Test: pass
Change-Id: I5cf42c8ff1e11207394e4852ba0bd03e4e3b7d2e
2017-04-11 16:41:07 -07:00
Etan Cohen
20925b0f56 [AWARE] Legacy HAL update: reduce host wakeup
Legacy HAL update to add indications when a solicited publisher
receives a match. Not used in current HAL. However, also added a
control bit to turn off host notification which is now enabled.

Bug: 35195773
Test: integration (sl4a) tests
Change-Id: I8ff378abaae11d4feaa42a9901abb1b48069dc4f
2017-04-04 22:13:36 +00:00
Etan Cohen
284511779c [AWARE] Create true translations between legacy and hidl enums
Replace implicits translations between legacy and hidl enums (using
casts) with explicit translations.

Bug: 35767620
Test: integration (sl4a) tests
Change-Id: I4ae4cd691226ce29bc0e92f9890fbb343a064505
2017-04-03 16:12:46 -07:00
Andreas Huber
3e4acb8b3a Convert all comments into "doxygen-ready" comments.
Bug: 36453077
Test: make
Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
2017-03-28 16:10:42 -07:00
Roshan Pius
34e4bc4dd2 wifi(implementation): Stop loading vendor library statically
libwifi-hal statically imports the vendor implementation of the legacy
HAL. Since the HIDL daemon is dynamically linking against libwif-hal,
there is no need for it to statically import the vendor implementation
library (one pointed to by: $LIBWIFI-HAL variable).

Bug: 36169790
Test: Compiles & device is able to connect to wifi networks with the
change.

Change-Id: Ie44b58328f9bdde011ba6d4a4d26f786c2d097e7
2017-03-27 22:14:04 +00:00
Steven Moreland
e90c31f125 Update makefiles.
Test: pass
Change-Id: I925baccbe51a32b7b7f3f66cf2918d017ee6b039
2017-03-24 21:50:45 -07:00
Etan Cohen
2d523c012e [WIFI] Restore initialization code
Restore the usage of WIFI-specific main function. The main
function was inadvertantly disabled by moving it into a static
library - which caused the default main to be used.

Need a custom main since need to stop WIFI before tests start
to enforce a clean starting point.

Bug: 35276551
Test: confirms custom main routine is called
Change-Id: I978827bc0f0f16d9ca4f159fbf42d0bc53f5df99
2017-03-23 17:37:42 -07:00
Etan Cohen
9e71d7d44f Merge "[AWARE] Add Passphrase data-path security" 2017-03-23 00:10:34 +00:00
Etan Cohen
c58619e8d9 [AWARE] Add Passphrase data-path security
Add mechanism to configure data-path security using Passphrase
(as an alternative to PMK).

Bug: 35866810
Test: integration (sl4a) tests passing.
Change-Id: If7094a44af1996d3caf5b776d492797f14a7be11
2017-03-21 16:49:40 -07:00
Roshan Pius
c314841614 supplicant(interface): Add an event for bssid changes
This is useful in debugging (& collecting metrics) when the active bssid changes.

Bug: 36451639
Test: Compiles & manual tests using the framework changes.
Change-Id: I5676dfb9ec9c13ae900c315eb8dfacb857e70fc1
2017-03-21 10:53:56 -07:00
Roshan Pius
a1c76e4d53 wifi(implementation): Return proper status code on initialize
The fallback HAL will return |WIFI_ERROR_NOT_SUPPORTED| when
|init_wifi_vendor_hal_func_table| is invoked.  This should be sent as is
to the HIDL interface instead of sending |WIFI_ERROR_UNKNOWN|.

Bug: 34859006
Test: Compiles
Change-Id: I5fd132368715bd158e617ad3cf2e6f88d147cef7
2017-03-20 19:20:32 -07:00
Roshan Pius
d65be16cfd supplicant(interface): Correct the WFD info length
Error logs from test:
03-17 18:34:34.303  1781  1781 E wpa_supplicant: Unexpected WFD device
info len: 6

Bug: 36401779
Test: Compiles
Change-Id: I65805599f8f3242a5c1f6ba8c0a1b9da05df79b4
2017-03-20 08:01:43 -07:00
Roshan Pius
94b4bdca75 supplicant(interface): Support for P2P client list and save config
Bug: 36042785
Test: Compiles
Change-Id: Ib47b47762c05e6252f692c1456e9b8d5dd8c051a
2017-03-20 08:01:43 -07:00
Roshan Pius
39c2609065 supplicant(interface): Add support for disabling auto connect
Adding a new API to prevent wpa_supplicant from initiating auto
reconnects.

Bug: 36282386
Test: Compiles & manual tests.
Change-Id: I81d7b1a3677cb26c6e9dc35b7302cc6b00d9a6a2
2017-03-16 16:48:57 -07:00
Roshan Pius
d23068fac6 supplicant(interface): List out all status/reason codes
List out all the association/disconnect reason codes exposed in the
IEEE80211 spec.

Bug:36363830
Test: Compiles
Change-Id: I27168bfb67fbc658339bc5fc9310ffdc9aec5ec6
2017-03-16 20:43:36 +00:00
Roshan Pius
864cae3795 Merge "supplicant(vts): More tests" 2017-03-15 20:34:19 +00:00
Etan Cohen
16ae0c8f86 Merge "[AWARE] Separate Aware (NAN) VTS tests into a separate test binary." 2017-03-15 14:42:46 +00:00
Etan Cohen
a49579b43a [AWARE] Separate Aware (NAN) VTS tests into a separate test binary.
Aware (NAN) VTS need to be in a separate test binary since whether
they run depends on the feature being supported by the device.

Bug: 36003265
Test: confirms separate binary built
Change-Id: If237e21e72a7c65f5587e40d98acb3146eae45a1
2017-03-15 01:14:13 +00:00
Roshan Pius
036da68261 supplicant(vts): More tests
These tests just invoke the HIDL interface API's and ensure
that they succeed or not. Some of these API's (especially P2P) need
multi device testing (AP, Peer) to ensure that they work.

Bug: 33457575
Test: adb shell /data/supplicant_hidl_test
Change-Id: Ibf547b5ed95895c429c8bcb59e4c43b3b436338f
2017-03-14 10:10:12 -07:00
Roshan Pius
d32a43f464 wifi(implementation): Make a boolean flag atomic
The flag |awaiting_event_loop_termination_| is accessed by multiple
threads, so make it atomic.

Bug: 33552618
Test: Compiles
Change-Id: I5ebe27fe88672565aae0daf34a89616d36f35f90
2017-03-14 08:30:45 -07:00
Roshan Pius
e42ace2404 wifi: Add support for multiple radio stats
Previously, we've always assumed that we have only one instance of
radio stats fetched in link layer stats. This is no longer true for the
newer devices which support multiple radios.

Also,
Changed the timestamp member from uint32_t to uint64_t.

Bug: 36148086
Test: The error logs no longer seen on newer devices.
Change-Id: I048a1db7cc0bfb0dc0dacafff2156f42a8ae1e63
2017-03-13 17:12:32 -07:00
Subhani Shaik
48df739a4d wifi: Link the new libcld80211 library
Bug: 32775496
Change-Id: I700dec21bfc3a36b8a3b09251b3004449fd49de7
2017-03-13 20:34:29 +00:00
Etan Cohen
48b4ce2e99 Merge "[WIFI][HIDL] Add device-based feature flag support" 2017-03-11 18:57:41 +00:00
Roshan Pius
78cfef9f0c wifi(implementation): Add null checks for RTT result
According to the legacy HAL header file, the LCI & LCR fields may not
always be populated. So, add null checks for them.

Bug: 36141536
Test: Compiles
Change-Id: Id2a5f5fd0eaf21b3a4d5cfcd26124c9fb6c90869
2017-03-11 05:41:59 +00:00
Etan Cohen
c57004008a [WIFI][HIDL] Add device-based feature flag support
Add mechanism to define feature support flags to
configure set of Wi-Fi features supported on a particular
device.

Bug: 32997844
Test: integration tests
Change-Id: Iffbf3ba237013f1030b24c0173641234a9c27e5c
2017-03-10 10:07:16 -08:00
Yuexi Ma
6b8720110b Change vts target base test class name
Test: make vts succeed, vts kernel tests and nfc hal tests passed
Change-Id: I38ae6cc940d0f17bb3352f360efdf9c70697c76b
2017-03-10 00:42:13 -08:00
Roshan Pius
cdca05557d Merge changes If83c1cbe,I12ad2665
* changes:
  wifi(implementation): Move out clearing on stop complete
  wifi(vts): Some IWifiChip/IWifiStaIface tests
2017-03-10 01:16:48 +00:00
Roshan Pius
46b6454d2f wifi(implementation): Move out clearing on stop complete
Currently, we invoke WifiLegacyHal.invalidate() inside the
|on_stop_complete_internal_callback| std::function. |invalidate|
nulls out |on_stop_complete_internal_callback| inside it which might be
considered a violation since we're deleting the std::function object
as we're executing it.

Bug: 36095153
Test: Compiles, start/stop wifi multiple times.
Test: Verified that a crash is not seen in asan build.
Change-Id: If83c1cbee78a1b6eca12686fcc1ec1de67134f13
2017-03-09 23:22:09 +00:00
Etan Cohen
255cdb29a0 Merge "[AWARE] Relocate ranging field in legacy HAL - match in HIDL impl" 2017-03-09 23:13:29 +00:00
Roshan Pius
3819e4193e wifi(vts): Some IWifiChip/IWifiStaIface tests
These tests basically just ensure that we can call the corresponding
API's successfully. More tests will be added in further CL's.

Bug: 33459306
Test: mmm -j32 hardware/interfaces/wifi/1.0/vts/functional/
&& adb push out/target/product/angler/data/nativetest64/
VtsHalWifiV1_0TargetTest/VtsHalWifiV1_0TargetTest /data/ &&
adb shell /data/VtsHalWifiV1_0TargetTest

Change-Id: I12ad26653993ce7167d007a887e7aff07fd0a5ce
2017-03-09 09:33:55 -08:00
Steven Moreland
691a455b9f Add hidl_default and make modules use hidl_default.
find hardware/interfaces -type f -not -path "*/.git/*" \
-exec sed -i -e '/cc_[A-Za-z_]\+/ { N; s/$/\n    defaults:
\["hidl_defaults"\],/ }' {} \;
./hardware/interfaces/update-makefiles.sh

Test: no warnings
Bug: 35840847
Change-Id: I468b76893bf3f4b62ad610d1d9603bcb8797a702
2017-03-08 16:22:00 -08:00
Steven Moreland
853a9b5feb update-makefiles.sh: wifi
Test: pass
Change-Id: If43aa789381ed43120e0a075587a89c0076c8433
2017-03-08 15:33:31 -08:00
Etan Cohen
5b804210ae [AWARE] Relocate ranging field in legacy HAL - match in HIDL impl
Relocate ranging report config in the legacy HAL. Match the correspoding
setting in the HIDL implementation (field itself not exposed).

Bug: 36065933
Test: integration (sl4a) tests
Change-Id: I651db9e8f63f8382706994d8b3b6cc266b77c73d
2017-03-08 11:44:01 -08:00