Commit graph

390 commits

Author SHA1 Message Date
Rakesh Sunki
6451ba7735 [AWARE]: Add support for configuring NAN sid on subscriber side
Provide configuration support to set sid on the subscriber side sync and
discovery beacons as part of NAN enable and config request.

(cherry-pick of commit b2c4b3825a5b1ef4713417538755b04225b2b53d)

Bug: 35195516
Test: integrated (sl4a) tests pass
Change-Id: I20548928a9ad81e8d3154eb5b982fd19add7659c
2017-04-20 12:47:34 -07:00
Subhani Shaik
1fc39e2e65 [AWARE]: Make changes to support NAN Publish Replied Indication
Bring in support for NAN Publish Replied indication.

Bug: 35195773
Test: integration (sl4a) tests
Change-Id: I3e7e488dfb2bc45753882755e3ce452b072d2f91
2017-04-04 15:12:05 -07:00
Subhani Shaik
35d241d686 [AWARE]: Add support to fetch second ndp channel
Add new parameter second ndp channel freq in the stats response
message to support the certification efforts.

Change-Id: I9011bd7d4c5f34a15fbfe871b67d255807df8347
2017-04-04 14:37:52 -07:00
Etan Cohen
ad6f1d5512 Merge "[AWARE]: Add support to accept either passphrase or pmk" 2017-03-23 00:10:34 +00:00
Subhani Shaik
890af5521a [AWARE]: Fix Nan capabilities mismatch
Bug: 36357282
2017-03-16 11:06:08 -07:00
Subhani Shaik
3686f0e883 [AWARE]: Add support to accept either passphrase or pmk
Modify publish/subscribe/Data Initiator/Data Indication messages
to accept either PMK or Passphrase key information. Also, provide
a new parameter service name in Data Initiator request and
Data Indication response to generate PMK from passphrase and
service name for out of band requests.

Bug: 35866810
Test: TBD
Change-Id: Ibe572928e892bbd10be79dc2e09911ada348e89d
2017-03-14 14:56:09 -07:00
Subhani Shaik
8747f478d1 [AWARE]: Add range report in SDEA params
Bug: 36065933
Test: integration (sl4a) tests.
Change-Id: Ice8e87e2a6e4ed4475c7e6dcc691103071e0a03b
2017-03-08 11:45:29 -08:00
Etan Cohen
ea2adcc23a Merge "Include get_iface_handle in header file" 2017-03-08 17:53:07 +00:00
Subhani Shaik
cc38d64254 Include get_iface_handle in header file
Bug: 35868267
Change-Id: I8f826fc15272b39686aea957f6407200cd62fac6
2017-03-01 09:20:46 -08:00
Etan Cohen
b82ef271aa Merge "[AWARE]: Fix documentation for Service responder policy" 2017-02-24 02:15:28 +00:00
Subhani Shaik
a76eea523d [AWARE]: Fix documentation for Service responder policy
Bug: 35665140
Change-Id: I5fe10da87f76acd50e2704f14879eafc91363e2b
2017-02-23 16:30:11 -08:00
Subhani Shaik
a39fe6182c [AWARE]: Enable SDEA based SSI
Bug: 35193423
Test: integrated (sl4a) test
Change-Id: If29d93391071710bd419eeab6e384ca154da9c85
2017-02-21 12:20:04 -08:00
Etan Cohen
427212dafe Merge "[AWARE]: Configure ranging on discovery sessions" 2017-02-21 16:32:20 +00:00
Subhani Shaik
f512262623 [AWARE]: Configure ranging on discovery sessions
Add ranging configuration on discovery session. Remove
from overall NAN configuration (enable/config).

Add controls/structures based on spec protocol.

Bug: 33821639
Test: integration (sl4a) tests pass
Change-Id: Ibd1065c401672ca1f6d3781e373178401d1e4a62
2017-02-17 13:03:18 -08:00
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
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
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
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
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
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
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
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
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
Chih-hung Hsieh
5df4b908c9 resolve merge conflicts of b3a0cc6 to stage-aosp-master am: 3fd32ebb0c am: 51c912c856
am: 7110b4bccf

Change-Id: I5267b963aa81c8f1cd9ea0e0d1a7e1b599557507
2016-06-28 18:42:00 +00:00
Chih-Hung Hsieh
3fd32ebb0c resolve merge conflicts of b3a0cc6 to stage-aosp-master
Change-Id: Ia40cd728f1d352d9a6611718dda8850afe3dfa63
2016-06-28 10:40:51 -07:00
Chih-hung Hsieh
b3a0cc6fab Merge "Fix misc-macro-parentheses warnings in hardware_legacy." 2016-06-27 23:34:12 +00:00
David 'Digit' Turner
6951ae9b01 resolve merge conflicts of 21cfbd1 to master
Change-Id: Ic2520bcd2ae516d0d6e8f724b11a0f39ccd64177
2016-06-22 10:29:46 +02:00
David 'Digit' Turner
1d07c27cf6 Merge \"Remove qemu dependency.\"
am: 146d8ade97

Change-Id: I77429a76555d35e95ed841c685b9783e5eb9c730
2016-06-22 08:12:34 +00:00
David 'Digit' Turner
14ca884e01 Remove qemu dependency.
Remove obsolete pieces from libardware_legacy that were related
to QEMU (i.e. running the system image under emulation) but are
no longer used.

Note that qemu tracing isn't implemented by the emulator anymore
(and has been for a long time).

BUG=25875346

Change-Id: I2593fe9f90241af9c5076fa248c30e0d8ab5d663
2016-06-21 14:14:10 +02:00
Christopher Wiley
1650ddc3f6 Move wifi.c out of libhardware_legacy
Most of this code is device independent, and we're parameterizing the
parts that are not in a way which makes the logic device independent.

Bug: 29321445
Change-Id: Ice9f16d966275378d4fc5a5201eca82f2ea67c5e
Test: Compiles, can associate to an AP.
2016-06-15 10:45:42 -07:00
Subhani Shaik
c54f9bcc94 Fix service instance Id in the data request
am: 7491031a5b

Change-Id: I39118acbdf676865286d5fc9485f9c96737d91d9
2016-06-14 23:26:59 +00:00
Christopher Wiley
baa0a49e7f Remove dead code in wifi.c
There are no callsites of this code today.

Bug: 28619119
Change-Id: Icc61a86dc71f411fd3550d825236f4ac025f4541
Test: Compiles
2016-06-13 15:15:35 -07:00
Chih-Hung Hsieh
0659908b3b Fix misc-macro-parentheses warnings in hardware_legacy.
Add parentheses around macro arguments used beside operators.
Bug: 28705665

Change-Id: I5ddb35e374a172807bf14e381f4808a55bc44417
2016-06-10 10:19:00 -07:00
Subhani Shaik
7491031a5b Fix service instance Id in the data request
The service instance Id needs to match the handle received during
the match indication. The current match handle is 32bit,fixing
the service instance id.
2016-06-02 16:22:22 -07:00
Etan Cohen
458933db4a [NAN] Add NAN data-path APIs
am: 666b6c2e2e

* commit '666b6c2e2e3962855de5da8f80d931694460ae1f':
  [NAN] Add NAN data-path APIs

Change-Id: Ie9ca80391c014111953c2f86cc325842dcc67b3d
2016-05-31 21:41:21 +00:00
Mitchell Wills
67c1940630 Remove const integers from HAL and define undefined structs am: 564211e861 am: a3a619d4d5
am: 6a52096c1a

* commit '6a52096c1a34d7fd4e3134b3a82ec456e371b849':
  Remove const integers from HAL and define undefined structs

Change-Id: Ic4a78892a5de081dedebda416cfa07daa7215352
2016-05-27 20:47:16 +00:00
Mitchell Wills
564211e861 Remove const integers from HAL and define undefined structs
Bug: 28984011
Change-Id: I6edfe547fbad127db9cbff654b96a476140d9f05
2016-05-26 13:13:37 -07:00
Etan Cohen
666b6c2e2e [NAN] Add NAN data-path APIs
Bug: 26562610
Change-Id: Ibc2cc1cdc609c31deb77ea54d1ea94c1de2c558a
2016-05-19 14:44:41 -07:00