Commit Graph

1209 Commits

Author SHA1 Message Date
Roshan Pius
2d3bea7f01 Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev 2016-02-23 16:08:25 +00:00
Wei Wang
3c0d65de0b Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev 2016-02-23 05:09:38 +00:00
Glen Kuhne
70fc162330 Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev 2016-02-19 21:35:10 +00:00
Glen Kuhne
b6cd6fa5a7 Add EID_TIM to ScanResult.InformationElement
Added EID_TIM to enable parsing of TrafficIndicationMap
InformationElements.

BUG=25691077
Change-Id: I99450f0b720175660486da15d6b13affbdb61adc
2016-02-19 10:54:51 -08:00
Roshan Pius
13f378e738 Modify the wake reasons data structure(2/2)
Changes in the android framework to use the modifed HAL API to
fetch the host wakeup reasons from the driver.

BUG: 26902794

Change-Id: I4df53c00b6b4ffd9f9ddb45577f6bccf150c43e4
2016-02-19 08:15:45 -08:00
Paul Stewart
274042519d Properly map EAP-GTC for TTLS
The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant.  Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.

This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.

Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal.  All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.

In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.

Bug:26400915
Change-Id: I866e2f77ad53d9a51c5f61acb9adef522661f721
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
2016-02-19 07:10:31 -08:00
Wei Wang
0db6066c7b Merge "Add Java API for secure RTT protocol." into mm-wireless-dev 2016-02-19 09:22:44 +00:00
Wei Wang
3cf4da9886 Disallow duplicate listeners for WifiScanner.
Bug:26663377

Change-Id: I2eea0fd3532c45f493aad7c0d5c28bda07f5bfed
2016-02-19 01:12:34 -08:00
Etan Cohen
0d0f0c7faf [NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]
The interfaces had multiple functions and are hence callback
and not a listener.

Note: purely a rename operation.

Bug: 27122760
Change-Id: Ib12711f56a64052455843859125d72268c465fc0
2016-02-18 23:48:59 +00:00
Etan Cohen
e4c50de752 [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]
Simplify configuration and consolidate structures whose difference
wasn't very clear.

Bug: 27122760
Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de
2016-02-18 23:46:01 +00:00
Wei Wang
71210b1022 Add Java API for secure RTT protocol.
Change-Id: I1c012f9e92e8b2af332524363f8f0c9921bf4bb5
2016-02-18 13:07:43 -08:00
Etan Cohen
aa36f07194 NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]
Add the concept of a client ID which is used to identify a specific
(one of several) clients in all API calls.

Bug: 26962024
Change-Id: I43f13d51bee8b57c6d0ba1174168288b8d6c21c5
2016-02-18 20:57:44 +00:00
Mitchell Wills
07e27b7541 Merge "Remove REPORT_EVENT_CONTEXT_HUB gscan option" into mm-wireless-dev 2016-02-17 20:30:56 +00:00
Peter Qiu
03d7581cf6 Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev 2016-02-16 18:04:14 +00:00
Peter Qiu
d667616659 WifiConfiguration: add constants for radio band
Change-Id: I2287ffb3d93351d73659327cef37a6d3ecd588b3
2016-02-12 08:50:05 -08:00
Bartosz Fabianowski
00144e8de3 Remove wifiConfiguration.isVisibleToUser()
This method seemed like a good idea at the time (quickly check whether a
network configuration is visible to a given user). However, once managed
profiles come into play, this simple method is no longer appropriate.
There is a more comprehensive replacement at
com.android.server.wifi.WifiConfigurationUtil.isVisibleToAnyProfile()
now and this method here can go.

BUG:26867426

Change-Id: Ia66aa6f74003a16eca24c5088d3aba8e0c9f8140
2016-02-12 11:12:45 +01:00
Etan Cohen
7d6c389edf NAN: Disable all DBG flags.
Change-Id: Ib60cf3c9fd4c8dbf973e118d94340fbfd890a738
2016-02-11 15:00:57 -08:00
Paul Stewart
4e9e3d02e0 Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev 2016-02-11 20:01:18 +00:00
Paul Stewart
ed9297991a WifiManager: Return empty scan list on remote exception
In the (hopefully rare) situation where there is a remote exception
from a call to getScanResults(), do not pass null back to callers.
Nobody expects this, and failures that occur as a result can distract
from the real problem (e.g., the system server crashing).  This CL
now returns an empty list.

BUG=27139097
TEST=None

Change-Id: I637eae1fa8ac1a1bc2b76dea8628359b5dec06e1
2016-02-11 11:16:17 -08:00
Jeremy Joslin
7a598d3d80 New systemapi to mark a wifi network as metered.
The implementation will come after the wifi code base has stablized.

BUG:27120794
Change-Id: I6a8140dae45dcd7ec70ac0c51b9513b907a41b63
2016-02-10 17:20:22 -08:00
Mitchell Wills
5a982939d2 Remove REPORT_EVENT_CONTEXT_HUB gscan option
Since all scan results will now be reported to the context hub this flag
is no longer needed.

Change-Id: I21c157a31fe26169606f6f53e8e0ce44d57c5ca5
2016-02-10 14:37:27 -08:00
Ritesh Reddy
c4a1188afd Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev 2016-02-10 17:48:31 +00:00
Randy Pan
2750b41d0b Merge "Add RSN Information Element ID" into mm-wireless-dev 2016-02-09 19:13:33 +00:00
Samuel Tan
8629390701 Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev 2016-02-09 18:18:05 +00:00
Jan Nordqvist
cf132a1bbc Merge "Fixed bad auto-generated method name." into mm-wireless-dev 2016-02-09 17:24:21 +00:00
Wei Wang
03a6b18350 Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev 2016-02-09 01:07:34 +00:00
Ritesh Reddy
aeb4c06013 Enabling SoftAP Configuration Backup.
SoftAp Conf is backed up as a serialized WifiConfiguration
object.

Change-Id: Ib7f4d130600313a67b710b45df274e15f0baad24
2016-02-08 10:33:13 +00:00
Etan Cohen
02033f800b Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev 2016-02-05 18:27:08 +00:00
Jan Nordqvist
afebe357fb Fixed bad auto-generated method name.
Change-Id: Ic60b0658f0b6a6e06dc9cf82299fe95bbd308972
2016-02-05 17:16:04 +00:00
Randy Pan
c0e86b2e90 Add RSN Information Element ID
Bug: 26908033
Change-Id: I9d7aa7642c51ea59a58e8facc8ad7af681c32b23
2016-02-04 14:56:13 -08:00
Jan Nordqvist
7a504417f2 Fixed bad serialization code in ScanResult.
Bug: 26964162
Change-Id: Ie9ad65936ab5173533773e5a711bcb81799acfb5
2016-02-03 15:00:57 -08:00
Wei Wang
564527dc5a Enable RTT Responder Role (1/4).
Change-Id: Ic1cd9056b3ebc67759d628a45b34287e5b0320b6
2016-02-03 11:32:50 -08:00
Vinit Deshpande
a772f0cf34 New System APIs for Passpoint r2 app.
Change-Id: I09428e9a393999f43aefe5efd77cffe4b1b17da5
2016-02-03 11:28:21 -08:00
Etan Cohen
8340beca62 NAN: for failed configurations - added configuration which failed.
Bug: 26880665
Change-Id: I3c43edfc1a6ba43d7cc393a00c4f41fd2e245f2d
2016-02-02 16:30:16 -08:00
Samuel Tan
c136cf9539 WifiEnterpriseConfig: allow getting and setting of ca_path
Add getters and setters for WPA supplicant's ca_path directive.

BUG: 26879191
Change-Id: Iad2857ddf7f09dd918637f99f740932e1fb7187c
TEST: WifiEnterpriseConfigTest CTS test
2016-02-02 15:57:31 -08:00
Mitchell Wills
934b3b9c6c Merge "Add a hidden anqp field to ScanResult" into mm-wireless-dev 2016-01-29 23:33:50 +00:00
Mitchell Wills
9eeba37851 Add a hidden anqp field to ScanResult
This allows ScanResults from WifiScanner to contain anqp data

Bug: 26525037
Change-Id: I54beb3c4e0b8bff06a8255d2dc53439941be3c66
2016-01-28 23:10:30 -08:00
Etan Cohen
638856c621 Merge "NAN: add message ID to correlate message callbacks to original message" into mm-wireless-dev 2016-01-28 18:36:29 +00:00
xin He
2fdee90b68 Merge "Remodel Network Selection" into mm-wireless-dev 2016-01-28 02:08:23 +00:00
xinhe
584dc6b8b9 Remodel Network Selection
There are two main changes in this CL:
    (1) Add user selection preference support. If user
    explicitly chooses a network, framework will remember
    it and consider user has a higher preference of this
    network over all other visible networks.

    (2) Seperate user set BSSID and framework chosen BSSID.
    The BSSID under WifiConfiguration is set by user and is
    not allowed to be overrided. The BSSID under Network
    selection status is the best BSSID chosen by the
    framework to associate with.

BUG=26012244
BUG=26721725

Change-Id: Iece91d20b139ef1c6aec05828c734d1706d81007
2016-01-27 14:50:42 -08:00
Rubin Xu
b84954cf92 Merge "API to set multiple CA certificates for WifiEnterpriseConfig" into mm-wireless-dev 2016-01-27 00:26:58 +00:00
Etan Cohen
b0fde5d79d NAN: add message ID to correlate message callbacks to original message
Add message ID to be specified by caller to each message. Same message ID
is provided back in callbacks indicating message send success or failure.

Bug: 26769293
Change-Id: I83958d5d219b02c153b0b93d707eaadfdacbf0dc
2016-01-26 08:51:02 -08:00
Vinit Deshpande
cb90cfbe16 Remove older passpoint code that we never made to work
Since we are hiding MO trees et al; there is no reason to
keep this code anymore.

Change-Id: Ic92131b5949c3b97b7a55fa7d3e0cd8f9e933aa0
2016-01-25 20:15:25 -08:00
Rubin Xu
a0e3d62162 API to set multiple CA certificates for WifiEnterpriseConfig
Support multiple CA certificates as trust anchors for server certs
when connecting to EAP networks. For the full feature, also requries
wpa_supplicant support, Wifi stack change to set up certificates and
aliases, and Wifi Setting UI tweak.

Bug: 22547958
Change-Id: I3c9f0e184632b79044a9e623ce0e7d9aaddd2ae3
2016-01-25 10:26:46 +00:00
Mitchell Wills
c90855d7a9 Updates for gscan HAL updates in N
This will compile, but all new functionality may not work

Change-Id: I88f27f375121c6b27377b075e9fd6bfad7b05aa4
2016-01-21 10:59:18 -08:00
xinhe
90a3841994 Phone reboots after connect-disconnect-reconnect to GoPro
Error is due to the wrong initialization on Disable
     Reason String

BUG=26664811

Change-Id: Ie4ede26eb5654ef369d2d07cb393765ad1edac61
2016-01-20 11:17:20 -08:00
Etan Cohen
e540b64aaf Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev 2016-01-15 01:17:08 +00:00
Etan Cohen
20d329b08d NAN: baseline NAN manager for discovery.
Initial framework for user API (all @hide for now). Supports:
- NAN configuration
- Publish/Subscribe = Discovery
- Message passing
- Notifications

Bug: 26216681
Change-Id: I72e467756a02f7b80c52fae916b9a47c8174af42
2016-01-14 11:34:07 -08:00
Bartosz Fabianowski
6fb0756d2f Add WifiConfiguration.shared flag
* Add boolean WifiConfiguration.shared, which indicates whether a network
  is shared (visible to and usable by all users) or private (visible to
  and usable only by the user who created it)
* Extend WifiConfiguration.configKey(...) so that when two users create
  private configurations for the same network, their configurationKeys
  will be different.
* Make AccessPoint.matches(...) take into account the shared flag

BUG=25600871

Change-Id: I4a4335fa3b4b4f850e16748583a29ab66992ddc8
2016-01-14 17:18:45 +01:00
xinhe
8d106780b6 Initial codes for Quality network selection [DO NOT MERGE]
In this change list, the old WifiAutojoin module is
    refactored initially. The old WifiAutojoinController is
    replaced with a new WifiQualifiedNetworkSelector.
    WifiConfiguration, WifiConfigureStore and
    WifiStateMachine have been modified accordingly. The new
    network selection logic is refactored with a more clear
    and deterministci one. To refer to thedescribed in
    details, in "Quality Network Selection and Connectivity
    Scan Management in N". The link of the document is:
    https://docs.google.com/document/d
    /1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c

Bug:26012244

Change-Id: I3df124c110e458e3b6bc29466b9046748d79582a
2016-01-12 16:29:43 -08:00