Commit graph

1070 commits

Author SHA1 Message Date
Etan Cohen
f23cd51227 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication" am: 6d26bb0360
am: c61d69fba8

Change-Id: I1de5ccbd20d333a5c5f53930a61d4e607419b515
2016-12-22 18:23:27 +00:00
Etan Cohen
c61d69fba8 Merge "[AWARE]: Enable ranging in Publish/Subscribe/Indication"
am: 6d26bb0360

Change-Id: Idf973a47c0156190690dd763115097f8308107ed
2016-12-22 18:17:38 +00: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
45420947af Merge "Roaming Enhancement API" am: ab920d2460
am: 9fc8d06e2f  -s ours

Change-Id: I9b09c131addc442d037b7e6656af657252858496
2016-12-13 19:38:54 +00:00
Randy Pan
9fc8d06e2f Merge "Roaming Enhancement API"
am: ab920d2460

Change-Id: Ic45f3678794eee98570e9cb29d64e672d4a22669
2016-12-13 19:31:59 +00:00
Randy Pan
ab920d2460 Merge "Roaming Enhancement API" 2016-12-13 19:25:41 +00:00
Randy Pan
bfb1de0e57 Merge "Roaming Enhancement API" into nyc-mr1-dev-plus-aosp 2016-12-13 17:16:23 +00:00
Etan Cohen
02701653c0 Merge changes from topic 'aware_hal_updates' am: 33b3f09576
am: 1d8b72d050

Change-Id: Icaf27482b02f03505166036d3b058d566e1c3e4d
2016-12-13 15:13:49 +00:00
Subhani Shaik
3a748b3221 [AWARE]: Enable Service Descriptor Extension Attribute am: 0001cdb414
am: 45559af039

Change-Id: I1c270e165424a94e07125a895c7d09b9f57a7cb0
2016-12-13 15:13:47 +00:00
Subhani Shaik
544b92baff [AWARE]: Enable Discovery MAC addr randomization am: f032356db0
am: 53fe3f6c9c

Change-Id: Ie8acccea12b10efc481048e67885d2b953b0f5ef
2016-12-13 15:13:46 +00:00
Subhani Shaik
5a18f78015 [AWARE]: Enable NAN Security am: 548fbb3ab5
am: 6968799354

Change-Id: I6606803b630079150da0812e5c1f813a97e3f51f
2016-12-13 15:13:44 +00:00
Subhani Shaik
34433346df [AWARE] Config/Publish/Subscribe DW interval config am: 79e0e1be8c
am: 8ee3b96dd1

Change-Id: I08e89131a7cdbcabd3f76d09f7b179a42fd540c3
2016-12-13 15:13:42 +00:00
Subhani Shaik
472872412e [AWARE]: Include ndp operating channel in Sync stats am: 2383b51f66
am: ab84238365

Change-Id: Icebb18eb1e7b0b3b9b2b7a68907600530bca678d
2016-12-13 15:13:40 +00:00
Etan Cohen
1d8b72d050 Merge changes from topic 'aware_hal_updates'
am: 33b3f09576

Change-Id: If263cb4f845c3aa1e64a9a07336e081315a28af4
2016-12-13 15:06:55 +00:00
Subhani Shaik
45559af039 [AWARE]: Enable Service Descriptor Extension Attribute
am: 0001cdb414

Change-Id: I2bd71eb03eb204805f4be4f5a225b1a7a74804c0
2016-12-13 15:06:47 +00:00
Subhani Shaik
53fe3f6c9c [AWARE]: Enable Discovery MAC addr randomization
am: f032356db0

Change-Id: Icaab72c73cae4b4579a93d7f90c0a006a16dc1bb
2016-12-13 15:06:45 +00:00
Subhani Shaik
6968799354 [AWARE]: Enable NAN Security
am: 548fbb3ab5

Change-Id: I0e974dd5d77ac52271071c09cf294e58562783ce
2016-12-13 15:06:44 +00:00
Subhani Shaik
8ee3b96dd1 [AWARE] Config/Publish/Subscribe DW interval config
am: 79e0e1be8c

Change-Id: Id99fc1792e12e2925a12cf87665ab9a8bb0208c7
2016-12-13 15:06:42 +00:00
Subhani Shaik
ab84238365 [AWARE]: Include ndp operating channel in Sync stats
am: 2383b51f66

Change-Id: I3c4ed640cd53cff0c25d8b4142567bd02e3e5940
2016-12-13 15:06:40 +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
75814ce428 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 23:37:34 +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
57e803839c Merge "[AWARE] Configure Service Auto/None response in firmware" am: 684b87fb88
am: fe7e0f99b9

Change-Id: Ifa23a032f13dddd5e6151e4abd1bcaf7fa712a99
2016-11-30 17:17:39 +00: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
3872714e8d Merge "Add description to NAN API/error codes" am: 815654a3d8
am: 88596972ee

Change-Id: Iaf1264090cb4f54d8c1ae7034bb59e3fd20f6b9c
2016-11-15 17:32:41 +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