Commit Graph

1213 Commits

Author SHA1 Message Date
Etan Cohen
cb71c477a2 Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev
am: 02033f800b

* commit '02033f800bda142994e402f3f66aaecb1c9f41be':
  NAN: for failed configurations - added configuration which failed.
2016-02-05 18:31:21 +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
e678624958 Fixed bad serialization code in ScanResult.
am: 7a504417f2

* commit '7a504417f23a1388d2a9bf53f0871d274e70c6b2':
  Fixed bad serialization code in ScanResult.
2016-02-03 23:06:58 +00:00
Jan Nordqvist
7a504417f2 Fixed bad serialization code in ScanResult.
Bug: 26964162
Change-Id: Ie9ad65936ab5173533773e5a711bcb81799acfb5
2016-02-03 15:00:57 -08:00
Jan Nordqvist
962c6a81e3 Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev
am: fd600b1113

* commit 'fd600b1113af6f66e28b65f5b53f4a7c751cdef9':
  New System APIs for Passpoint r2 app.
2016-02-03 20:00:47 +00: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
Mitchell Wills
b8c17cc30b Merge "Add a hidden anqp field to ScanResult" into mm-wireless-dev
am: 934b3b9c6c

* commit '934b3b9c6c83a372d5def7abaf22d0f185a810de':
  Add a hidden anqp field to ScanResult
2016-01-29 23:38:08 +00: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
82438d35cf Merge "NAN: add message ID to correlate message callbacks to original message" into mm-wireless-dev
am: 638856c621

* commit '638856c6219e3b97ba0c398463a69cb758f07bdb':
  NAN: add message ID to correlate message callbacks to original message
2016-01-28 18:42:07 +00: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
cb3308a335 Merge "Remodel Network Selection" into mm-wireless-dev
am: 2fdee90b68

* commit '2fdee90b685781ec5e30f0788b727f692df32d40':
  Remodel Network Selection
2016-01-28 02:15:56 +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
7705a0d6ad resolve merge conflicts of b84954cf92 to master.
Change-Id: I8a5a1a989968c46ea4807db9e7e06b298244876d
2016-01-27 00:43:38 +00: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
Vinit Deshpande
9465a03831 Merge "Remove older passpoint code that we never made to work" into mm-wireless-dev
am: 82c8b7edd0

* commit '82c8b7edd0656bcab79411c8dbfe3651a314a559':
  Remove older passpoint code that we never made to work
2016-01-26 22:41:15 +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
Mitchell Wills
12eef9f18a Updates for gscan HAL updates in N
am: c90855d7a9

* commit 'c90855d7a9f3ebd300de4dad9842cd6771ff27d1':
  Updates for gscan HAL updates in N
2016-01-25 19:12:55 +00: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
xin He
9e717cbddb Merge "Phone reboots after connect-disconnect-reconnect to GoPro" into mm-wireless-dev
am: 77eb57976e

* commit '77eb57976e67c36b33d1e3ad17ec9f4033b09398':
  Phone reboots after connect-disconnect-reconnect to GoPro
2016-01-20 19:45:51 +00:00
Jeremy Klein
94e95746db Merge "Expose WifiAp methods as @SystemApi." 2016-01-20 19:27:14 +00:00
Jeremy Klein
b625377b1a Expose WifiAp methods as @SystemApi.
GTS tests to follow shortly.

BUG: 22406002
Change-Id: I42883fa5e35a11b4b2d734f07b7d72f2ac0ec1f8
2016-01-20 11:17:53 -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
Prerepa Viswanadham
045891e4bc WLAN wake reason accounting from driver.
Cherry-picked from 46f5f53d28

Bug: 26572953
Change-Id: I58e0594682bf0f1d5746e9a2d8ec3091a5bf550f
2016-01-15 14:23:21 -08:00
Etan Cohen
3da7357951 Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev
am: e540b64aaf

* commit 'e540b64aaf58460f7930a5e4937cee660215c948':
  NAN: baseline NAN manager for discovery.
2016-01-15 01:29:48 +00: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
f9bf6da6cd Add WifiConfiguration.shared flag
am: 6fb0756d2f

* commit '6fb0756d2f59d70507919350f6192718b5d3f630':
  Add WifiConfiguration.shared flag
2016-01-14 17:24:52 +00: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
f7705c3ed6 Initial codes for Quality network selection
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

cherry-picked from 8d106780b6
and make changes on WiFiConfigurationSerializer.java since
it is not on mm-wireless-dev
Bug:26012244
Change-Id: I44e454544b630b891c9a58a18b5a028edcce580f
2016-01-13 15:06:30 -08: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
Randy Pan
a47f684020 resolve merge conflicts of 8c79fe5dc4 to master.
Change-Id: Id331e763f64ecbf8ed23764a487e32b94c4d3c09
2015-12-29 15:09:09 -08:00
Randy Pan
8c79fe5dc4 Correct WiFi exponential back off scan
Correct the comments for exponential back off scan. Only binary
exponential back off scan is supported.

Updated the API doc. A couple of un-related fields which were
not updated get updated as well.

Bug: 26236392
Change-Id: I5668092f393b564aa40904ed609a51aa16890614
2015-12-29 11:28:43 -08:00
Prerepa Viswanadham
46f5f53d28 WLAN wake reason accounting from driver.
Change-Id: I58e0594682bf0f1d5746e9a2d8ec3091a5bf550f
2015-12-16 17:54:39 +00:00
Andreas Gampe
e6748ce31f Frameworks/base: Use Arrays.toString
Fix a couple of cases where Arrays.toString should be used.

Bug: 19797138
Change-Id: I905fc79e63face9b26975320a92086c732bf6316
2015-12-14 12:04:26 -08:00
Mitchell Wills
075698c35f DO NOT MERGE Expose gscan exponential backoff API
Will be ignored until scan scheduling supports it

Cherry-picked from 2564d9a4ef
Change-Id: I9d392080e6ec8dfa9a998f6c04ec37f9c6dad0b2
2015-12-10 16:06:50 -08:00
Mitchell Wills
21c748d091 DO NOT MERGE Moved Wifi InformationElement parsing to a common utility class
Cherry-picked from 97c46ef286
Change-Id: Iaa0cfc39ac4df375f80f01cf59eb5f0d0ae61879
2015-12-10 16:06:50 -08:00
Mitchell Wills
a23840e7a4 DO NOT MERGE Remove old APIs that are no longer used/implemented
All of these APIs were hidden and are no longer used by anyone. The scan
APIs are being replaced by the new WifiScanner API

Cherry-picked from 88d93cd68a
Change-Id: I36ffef137d0620263278e5ef46bbc498a39c588f
2015-12-10 16:06:50 -08:00
Mitchell Wills
5374e36bb5 DO NOT MERGE Add missing ap threshold config for hotlists
Cherry-picked from ff4fdceafe
Change-Id: I9e31e72560840ea57ab191e820acf8e3faf00c36
2015-12-10 16:06:50 -08:00
Mitchell Wills
d1ed98f833 DO NOT MERGE Check if link stats are supported when reporting activity info
Cherry-picked from 9a568e6f2f
Bug: 23286362
Change-Id: I42c91d488acd39341a6874797788d3e5357f0270
2015-12-10 16:06:50 -08:00
Jan Nordqvist
255d41dce1 DO NOT MERGE Hotspot 2.0 relase 2 first cut.
CP mods to take a URL as a parameter, and new ScanInfo object.

Cherry-picked from 52eb29f082
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
2015-12-10 16:06:50 -08:00
Jeremy Klein
b8c7badbb5 Mark WIFI_AP_STATE_CHANGED_ACTION and extras @SystemApi.
These will be used by Magic Tether within GmsCore.

Change-Id: I06691e69d256d0400d16a7bb63e3406fada7b5f1
2015-12-03 18:07:44 -08:00
Neil Fuller
568f4de11a Merge "Fix @code escapes" 2015-12-03 09:44:01 +00:00
Neil Fuller
71fbb81b14 Fix @code escapes
The body of {@code} must not be HTML escaped. This is one of
several changes that fix the source in conjunction with a
doclava fix.

Bug: 25757239
Change-Id: Ib38a0fa2dd2a3d68e467f78a812071e763d7e881
2015-12-02 14:24:11 +00:00
Sungsoo Lim
0d3d1f825f Fixed typos: when when
Change-Id: I80c0b8817dcbed45071e42d9ffa88bae52a93a81
2015-12-02 14:50:36 +09:00
Makoto Onuki
a31ebbc439 Add DO API to get wifi mac address
Bug 25496044

Change-Id: Ib1f0ce4ca10951edcfaa0aa79ae5c2d142a74599
2015-11-24 15:38:16 -08:00