Commit graph

1062 commits

Author SHA1 Message Date
Etan Cohen
85dd512272 [NAN] Security configuration (cipher)
Add a constant to make the no-cipher specification explicit.

Bug: 35387576
Test: integrated (sl4a) tests pass.
Change-Id: Ia272cad70cd4bedbdbdb4d2c856167305f747a30
2017-02-17 11:31:25 -08:00
Etan Cohen
1ea0399492 Merge "[AWARE]: Document the default values in NAN enable/config" 2017-02-16 21:00:11 +00:00
Etan Cohen
f43910da9e Merge "[AWARE]: Fix return code for transmitFollowUp method" 2017-02-16 20:16:45 +00:00
Subhani Shaik
eb72fbaf45 [AWARE]: Document the default values in NAN enable/config
Bug: 34059183
Change-Id: Ic651e93ef46d2f7ecf564f9a504db44d27401422
2017-02-16 19:16:47 +00:00
Subhani Shaik
0b0387e2ab [AWARE]: Fix return code for transmitFollowUp method 2017-02-15 22:20:20 -08:00
Etan Cohen
7fe581f49c Merge "[AWARE] Clean up deprecated error value field" 2017-01-25 23:30:38 +00:00
Etan Cohen
7cee598173 [AWARE] Clean up deprecated error value field
Left deprecated field in place since it broke
dependent projects. Dependencies cleaned-up -
remove field.

Bug: 27914592
Test: build only requirements since unused field
Change-Id: I910ffd811ddbca9b83a0190eaede2a58b36fedc8
2017-01-18 19:08:49 +00:00
Treehugger Robot
b9344a5773 Merge "Convert libpower from Android.mk to Android.bp" 2017-01-14 04:24:52 +00:00
Colin Cross
d945d77458 Convert libpower from Android.mk to Android.bp
See build/soong/README.md for more information.

Test: builds
Change-Id: I4cc68e4bbe65abe741c02448aa7f42fdfd5804fa
2017-01-12 15:35:16 -08:00
Etan Cohen
6ffa14dd6c Merge changes from topic 'qc_api_drop'
* changes:
  [AWARE]: Error code fix in NdpIndiatorRequest
  [AWARE]: Config options to disable indications during Discovery
2017-01-05 17:48:52 +00:00
Subhani Shaik
3cdbc44764 [AWARE]: Error code fix in NdpIndiatorRequest
Bug: 32207606
Test: integration (sl4a) tests passing - no regressions
Change-Id: I0d0e995b8506b3fe44cd0dc419a187739fa448de
2017-01-04 15:27:27 -08:00
Subhani Shaik
9c90771dee [AWARE]: Config options to disable indications during Discovery
Bug: 33250076
Test: integration (sl4a) tests passing - no regressions
Change-Id: I79b2ce07ed5798089e7762e6ba8e6f8a057928a6
2017-01-04 15:26:55 -08:00
Etan Cohen
6d26bb0360 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" 2016-12-22 18:01:01 +00:00
Subhani Shaik
ddf249539a [AWARE]: Enable ranging in Publish/Subscribe/Indication
Bug: 33821639
Test: unit + integration (sl4a) tests passing
Change-Id: I5aa9f39527a5296fa6a361a459b574521c774591
2016-12-21 22:41:53 -08:00
Randy Pan
ab920d2460 Merge "Roaming Enhancement API" 2016-12-13 19:25:41 +00:00
Etan Cohen
33b3f09576 Merge changes from topic 'aware_hal_updates'
* changes:
  [AWARE]: Enable Service Descriptor Extension Attribute
  [AWARE]: Enable Discovery MAC addr randomization
  [AWARE]: Enable NAN Security
  [AWARE] Config/Publish/Subscribe DW interval config
  [AWARE]: Include ndp operating channel in Sync stats
2016-12-13 15:01:55 +00:00
Subhani Shaik
0001cdb414 [AWARE]: Enable Service Descriptor Extension Attribute
Bug: 33554197
Test: builds
Change-Id: I22e442391776d86aa69e888fade4f03ca4002cbe
2016-12-12 15:06:57 -08:00
Subhani Shaik
eaddf13de1 Roaming Enhancement API
Roaming enhancements to avoid critical sections between
firmware based network selection and framework based network
selection. Also remove blacklist_bssid changes from gscan.h
to avoid duplication.

BUG: 32883971
Test: Build.
Change-Id: I4c851e9c1969123427f2a92e729b9a5b6fd5b8d8
Merged-In: I4c851e9c1969123427f2a92e729b9a5b6fd5b8d8
2016-12-12 14:39:23 -08:00
Subhani Shaik
f032356db0 [AWARE]: Enable Discovery MAC addr randomization
By default discovery MAC address randomization is enabled
and default(maximum) interval value is 30 minutes(1800 seconds).
Nan enable and config can specify the interval value in seconds.
Value of zero disables discovery MAC address randomization.

Bug: 33386762
Test: builds
Change-Id: I5dc10db8535227575f96635604665b6f52f8d507
2016-12-12 14:23:18 -08:00
Subhani Shaik
548fbb3ab5 [AWARE]: Enable NAN Security
1) Include security params in Publish/Subscribe/Data Request/Response
   Structures.
2) Include security params in MatchIndication.

Bug: 33552694
Test: builds
Change-Id: I7a3af05b17f18040b311cf861c8dc0a0bba99d7d
2016-12-12 14:17:20 -08:00
Subhani Shaik
79e0e1be8c [AWARE] Config/Publish/Subscribe DW interval config
As part of the Power save enhancements:
1) The device level DW intervals to be configured through config API.
2) Awake DW intervals for publish and subscribe(period parameter)
   can be configured using the interval values 1, 2, 4, 8, 16.

Bug: 33552536
Test: builds
Change-Id: I3177ba13c861275a5860b825d3c466e0643bcec1
2016-12-12 14:00:03 -08:00
Subhani Shaik
2383b51f66 [AWARE]: Include ndp operating channel in Sync stats
Change-Id: I8bf99a669b9ab52a85100e8e8e3228bb71cf4d04
2016-12-12 12:33:29 -08:00
Etan Cohen
fe7e0f99b9 Merge "[AWARE] Configure Service Auto/None response in firmware"
am: 684b87fb88

Change-Id: Ie9734b64f262f1186e67a7e9a74a03c938eab642
2016-11-30 17:11:19 +00:00
Etan Cohen
684b87fb88 Merge "[AWARE] Configure Service Auto/None response in firmware" 2016-11-30 17:02:11 +00:00
Subhani Shaik
457e26fd7b [AWARE] Configure Service Auto/None response in firmware
Configure the Service Non Auto responder mode.
Accept all subscribes is the default firmware behavior.
If Non Auto response is configured in the Publish API,
firmware notifies the framework and expects a response
from the Publisher.

Bug: 33209958
Test: integration data-path (sl4a) tests passing
Change-Id: I78f096d0d046f3bd39421269c79b9012a3a3cc0e
2016-11-29 22:18:04 +00:00
Etan Cohen
88596972ee Merge "Add description to NAN API/error codes"
am: 815654a3d8

Change-Id: Id111bff19ee94a365d5d6fb777e8dbe8b867e092
2016-11-15 17:25:36 +00:00
Etan Cohen
815654a3d8 Merge "Add description to NAN API/error codes" 2016-11-15 17:20:22 +00:00
Subhani Shaik
b06466da76 Add description to NAN API/error codes
(cherry-pick of commit de91d3f9fe307f0f49acc2650e221bd6b9b698f7)
(cherry-pick of commit af855190314fe919cc4436e402d727c4b6191aa2)

BUG: 27914592
Change-Id: I7d63472c5c9872817e9535e55c8b8c04c5b7c4e2
2016-11-15 15:00:16 +00:00
Christopher Wiley
785955a49f Merge "Use libbase logging in libwifi-hal-common" am: fa89e62cec am: 4debb7cb99
am: 5f482c156e

Change-Id: I51acc914fc846c3ee2912ca1e2ad5a4bb19f0f8f
2016-09-12 18:05:37 +00:00
Christopher Wiley
5f482c156e Merge "Use libbase logging in libwifi-hal-common" am: fa89e62cec
am: 4debb7cb99

Change-Id: I03186c0e350293afcc76369681e777538bc7ccba
2016-09-12 18:02:07 +00:00
Christopher Wiley
4debb7cb99 Merge "Use libbase logging in libwifi-hal-common"
am: fa89e62cec

Change-Id: Ic042cf695cbfeb6a14f7ac3f9456e1d7c05ec163
2016-09-12 17:58:43 +00:00
Christopher Wiley
fa89e62cec Merge "Use libbase logging in libwifi-hal-common" 2016-09-12 17:52:45 +00:00
Christopher Wiley
acb778768f Use libbase logging in libwifi-hal-common
This allows log messages to appear under the global tag of the
process using the code, rather than per file log tags.

Bug: 31398942
Test: Compiles for bullhead
Change-Id: I1a17dfb1e758d22ec76295d85194c85dd2cf4ed3
2016-09-09 13:53:56 -07:00
Mitchell Wills
10c5349097 Merge "Remove build wifi dependencies for brillo" am: 24c133dccd am: 6b4c8d68ac
am: 91810f2385

Change-Id: I2df3769d88050e8e1dba881fb2d52c44206e9406
2016-09-01 20:16:16 +00:00
Mitchell Wills
91810f2385 Merge "Remove build wifi dependencies for brillo" am: 24c133dccd
am: 6b4c8d68ac

Change-Id: Icc6102f22212517a0d41e950d5361e200474ce32
2016-09-01 20:13:16 +00:00
Mitchell Wills
6b4c8d68ac Merge "Remove build wifi dependencies for brillo"
am: 24c133dccd

Change-Id: I2ad0b2f7496e707cbcbec096172b01a8917f7258
2016-09-01 20:09:51 +00:00
Treehugger Robot
24c133dccd Merge "Remove build wifi dependencies for brillo" 2016-09-01 20:03:20 +00:00
Mitchell Wills
297186cbb7 Remove build wifi dependencies for brillo
Change-Id: I742225571d2c3156ef0b5be5f296b1cba0ee9c90
2016-09-01 10:09:54 -07:00
Amarnath Hullur Subramanyam
6550efb63e Merge branch 'stage-aosp-master' into nyc-dev-plus-aosp
am: f2e485fd79

Change-Id: I073a57063e6a59a07f200949539b1d12b2488cd3
2016-08-29 23:22:20 +00:00
The Android Automerger
f2e485fd79 Merge branch 'stage-aosp-master' into nyc-dev-plus-aosp 2016-08-29 23:07:59 +00:00
Amarnath Hullur Subramanyam
41962ea803 Wifi: Corrected NanSRFState enum type
am: 523a38f9c4

Change-Id: I57dc1df39897572634df50f259fa01f646333dc0
2016-08-24 20:11:56 +00:00
Amarnath Hullur Subramanyam
523a38f9c4 Wifi: Corrected NanSRFState enum type
The NanSRFState enum was incorrectly specifying NAN_DO_NOT_USE_SRF
as 1 which was not insync with the wifi firmware expected value
causing the case of active subscribe and solicited publish to fail.
This commit updates the enum type appropriately.

Bug: 30898004
Change-Id: I89f092964daeeb962b57ea474131bb58984a4d43
2016-08-23 16:10:11 -07:00
Subhani Shaik
8c03fcdcc7 [NAN] Add msg to indicate transmit followup queue is full
am: 720544bb0d

Change-Id: I84bdfabc389f41c249c5f9a9b48c489021134433
2016-07-28 17:03:27 +00:00
Subhani Shaik
720544bb0d [NAN] Add msg to indicate transmit followup queue is full
BUG: 29642700
Change-Id: I84ae1ec945c8795edad0dee2b0c575f3f633f6db
2016-07-28 08:13:53 -07:00
TreeHugger Robot
1fc1551394 Merge "Include common wifi HAL functionality" 2016-07-01 02:27:16 +00:00
Christopher Wiley
3af1b5ddfb Include common wifi HAL functionality
Unfortunately, the LOWI server links against this library and hopes to
find this functionality.

Test: Scanning works on bullhead again
Bug: 29913356

Change-Id: Icb7c27df399d7fcb25aff88a57da78219881a25e
2016-06-30 16:46:35 -07:00
Chih-Hung Hsieh
4c0a6f919b Merge \\\\"Fix google-explicit-constructor warnings in libhardware_legacy\\\\" am: a7355c3ab4 am: d0273aaaab am: c9cadd7944
am: 9dca3a3c75

Change-Id: I7dfe40cc965740ba695943cba6c342d7ec8fc100
2016-06-30 22:35:57 +00:00
Chih-Hung Hsieh
9dca3a3c75 Merge \\\"Fix google-explicit-constructor warnings in libhardware_legacy\\\" am: a7355c3ab4 am: d0273aaaab
am: c9cadd7944

Change-Id: I79049fe097f09490dc637bb87d568f89ee0e10eb
2016-06-30 22:32:08 +00:00
Chih-Hung Hsieh
c9cadd7944 Merge \\"Fix google-explicit-constructor warnings in libhardware_legacy\\" am: a7355c3ab4
am: d0273aaaab

Change-Id: Ifc99dc49c080eeadc7e4634b1cfe6bf6bde32c78
2016-06-30 22:28:21 +00:00
Chih-Hung Hsieh
d0273aaaab Merge \"Fix google-explicit-constructor warnings in libhardware_legacy\"
am: a7355c3ab4

Change-Id: I0f4c805e27c1e51d15f63d7e6b9c0521fd9bd520
2016-06-30 22:24:38 +00:00