Commit Graph

1374 Commits

Author SHA1 Message Date
Etan Cohen
d58e6cf14b [NAN] Add master switch to enable/disable usage of NAN APIs.
am: d3137af

* commit 'd3137af10291ff888125de747d9ee05f73f3fd8e':
  [NAN] Add master switch to enable/disable usage of NAN APIs.

Change-Id: Iea1d3cf5eca777449898c571d58db33c59ffd0c2
2016-04-08 17:30:41 +00:00
Etan Cohen
d3137af102 [NAN] Add master switch to enable/disable usage of NAN APIs.
Add master switch to enable/disable usage of NAN. Tie into Wi-Fi
state machine (to enable/disable based on Wi-Fi enable/disable).
Dispatch broadcasts when NAN status changes.

Bug: 27698011
Change-Id: Iea36388443ff8d0dc26a280220022c6bdba6a0c8
2016-04-08 10:18:37 -07:00
Etan Cohen
47310a3e96 resolve merge conflicts of 65f4b14 to master
Change-Id: I4eccf59d036e76ad5ed9a1ab870436d000bce8e0
2016-04-08 08:26:59 -07:00
Etan Cohen
65f4b14545 Merge "[NAN] Re-factor connect/config flow" into mm-wireless-dev 2016-04-08 15:00:12 +00:00
Etan Cohen
52b3a24a02 [NAN] Re-factor connect/config flow
Simplify flow: configure and connect in a single call.
Prevent info leak: no longer provide configuration back to caller.
Update error status codes

Bug: 27617910
Bug: 27553226
Bug: 27579450
Bug: 27674927
Change-Id: Id7aba816a074dbbe0cb188cfe498c97dccbdcb27
2016-04-08 07:55:59 -07:00
Roshan Pius
b83a814582 Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev am: 5a4027e
am: ad1e692

* commit 'ad1e692c658324a3592375e7b5a88f104ad73c9d':
  WifiScanner: Remove pnosetting stopPno API (1/2)

Change-Id: I1eb3d12df70fa00f4f7a5071cdfcee803b2cb7cb
2016-04-07 19:40:03 +00:00
Roshan Pius
5a4027e26c Merge "WifiScanner: Remove pnosetting stopPno API (1/2)" into nyc-dev 2016-04-07 19:28:24 +00:00
Roshan Pius
37aeb4700b WifiScanner: Remove pnosetting stopPno API (1/2)
BUG: 27532350
Change-Id: I6df3df56e66c7bbb8443c038cd8345989cf2d57e
2016-04-07 10:32:24 -07:00
Randy Pan
be20916b8c Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev am: 429b9fc
am: 306e707

* commit '306e7073385f491f51b867f6c35c9e4310f315e8':
  Enable/disable WifiConnectivityManager at runtime

Change-Id: I34ad663f8a5c4209b2033ac25902b1a2b73b07e3
2016-04-07 17:29:27 +00:00
Randy Pan
429b9fcb7b Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev 2016-04-07 17:22:49 +00:00
Rubin Xu
396a9da2d9 Fix wrong condition am: 492ed58 am: f5c0a55
am: 41847fa

* commit '41847fab90f69a26ab91359562da9519953da5d8':
  Fix wrong condition

Change-Id: Ib52780dc1dce93075cc0b4f7450c2dfa99034f1d
2016-04-07 15:07:30 +00:00
Rubin Xu
f5c0a55d1e Fix wrong condition
am: 492ed58

* commit '492ed589df3609a15dd6a33709fc8d855ec1072d':
  Fix wrong condition

Change-Id: I23f23c4b77d19286915e501bea482e4d1fe7e714
2016-04-07 15:00:59 +00:00
Rubin Xu
492ed589df Fix wrong condition
Bug: 28050399
Change-Id: If729ee2bcc5496b5ee381e490f72c751da04dc09
2016-04-07 12:09:27 +01:00
Randy Pan
2c4ff2e77e Merge "Obsolete a couple of auto-join related APIs." into nyc-dev am: ee94486
am: 50149fe

* commit '50149fefed82312f2b3fc14ea5a1a7b868cf7c73':
  Obsolete a couple of auto-join related APIs.

Change-Id: I35ba2c0b133a9f9e6e65ceb678df2fd8eae373d9
2016-04-06 22:45:08 +00:00
Randy Pan
74638cdb31 Enable/disable WifiConnectivityManager at runtime
Add support to turn on and off WifiConnectivityManager at
runtime.

Bug: 27968625
Change-Id: I57d3604bfb2a4e816fb16f6389f7cbaa2460c24b
2016-04-04 10:44:52 -07:00
Randy Pan
467400a23b Obsolete a couple of auto-join related APIs.
Remove the get/setHalBasedAutojoinOffset() APIs. HAL based PNO
is now enabled on all supported devices.

Bug: 26666366
Change-Id: I55b3a80a5807c33569dbbdf4dcfc2411af067567
2016-04-04 10:44:36 -07:00
Mitchell Wills
8f413747ec Merge "Send WorkSource for scan requests so the origin can be overridden" into nyc-dev am: 612b4c5
am: 0386875

* commit '038687564c06d413338d5056f56f129cb07856ab':
  Send WorkSource for scan requests so the origin can be overridden

Change-Id: I915cc90bf829921bf5ada3f47ef60ecdddfb1f5f
2016-03-30 22:11:36 +00:00
Mitchell Wills
612b4c588b Merge "Send WorkSource for scan requests so the origin can be overridden" into nyc-dev 2016-03-30 21:58:44 +00:00
Mitchell Wills
6deac3313f Merge "Add WifiScanner API that accepts a WorkSource for scans" into nyc-dev am: 133240f
am: bb8ab1c

* commit 'bb8ab1ce70e1dcfad3ac40cc6285b30e2dbae302':
  Add WifiScanner API that accepts a WorkSource for scans

Change-Id: I74220a4ae8f6cc407809461dcf83254512e60ded
2016-03-30 19:21:27 +00:00
Mitchell Wills
133240f565 Merge "Add WifiScanner API that accepts a WorkSource for scans" into nyc-dev 2016-03-30 18:43:23 +00:00
Mitchell Wills
ad95b6a6ea Send WorkSource for scan requests so the origin can be overridden
Bug: 27903217
Change-Id: I37b24c0f5b8e9408a9f25e4479cdbb71235757a6
2016-03-29 17:36:41 -07:00
zhangshuxiao
f51097c743 When wifi ssid is empty, return WifiSsid.NONE
Issue 199610

When WifistateMachine enter Roaming State, WifiInfo
getSSID will return 0x, statusbar show "0x", because
roaming State do not update WifiInfo mWifiSsid.

Cherry pick from I241f8e9c11dc16db26cadde133043745f2f19573

BUG=27403109
TEST=compile and unittests
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>

Change-Id: Ieb7429511898a5ed3d44fd15fc1f250c122e802a
2016-03-29 16:35:47 -07:00
zhangshuxiao
77f6e911ad Merge "When wifi ssid is empty, return WifiSsid.NONE" am: 4af5c34 am: eef758c
am: b33fbc3

* commit 'b33fbc33c637442ea9932f187a1012ca9f613f04':
  When wifi ssid is empty, return WifiSsid.NONE

Change-Id: I8ee4ba475b3a5a1c44d873e0382fe0766565bb33
2016-03-29 22:54:08 +00:00
zhangshuxiao
b33fbc33c6 Merge "When wifi ssid is empty, return WifiSsid.NONE" am: 4af5c34
am: eef758c

* commit 'eef758cb01df94642ddf1a50ccc434b4a4b343fc':
  When wifi ssid is empty, return WifiSsid.NONE

Change-Id: I179f5641cf98fdce947c4f61a2dd1d52595952b4
2016-03-29 22:51:07 +00:00
Mitchell Wills
d24427fabd Add WifiScanner API that accepts a WorkSource for scans
Bug: 27903217
Change-Id: I2303a2b91a4914e6cacc3108d29697f7a2dad056
2016-03-29 14:13:15 -07:00
Roshan Pius
ef633fedc7 Merge changes from topic \'wifi_tx_power_levels\' into nyc-dev am: 89d9480
am: af13fd0

* commit 'af13fd06a9fe30cf9fb5b5fd16983d296f8f9138':
  Add new wifi tx power levels in Wifi activity energy
  Add new wifi tx power levels in link layer stats

Change-Id: Ica75ebf4e820364d0457cc5675abae6fe91b70e0
2016-03-29 18:43:28 +00:00
Roshan Pius
89d9480be2 Merge changes from topic 'wifi_tx_power_levels' into nyc-dev
* changes:
  Add new wifi tx power levels in Wifi activity energy
  Add new wifi tx power levels in link layer stats
2016-03-29 18:03:37 +00:00
Rebecca Silberstein
a1a52d3b50 Merge "Add hasEverConnected to NetworkStatus object" into nyc-dev am: 174b140
am: c1a83a0

* commit 'c1a83a0bc5971147ab9d8eccbc8d06a0c270bb4b':
  Add hasEverConnected to NetworkStatus object

Change-Id: I3a002b0c3369c42d2e5ee3a54c9b9eeabdc85578
2016-03-29 16:12:36 +00:00
Rebecca Silberstein
174b140dfe Merge "Add hasEverConnected to NetworkStatus object" into nyc-dev 2016-03-29 16:04:35 +00:00
Mitchell Wills
6fe50d203e Merge "Add accessor for buckets scanned in ScanData" into nyc-dev am: 396884c
am: e129dff

* commit 'e129dff3c49e3903431c5f46602f7eb079d6ad09':
  Add accessor for buckets scanned in ScanData
2016-03-28 21:14:01 +00:00
Mitchell Wills
d1f33cc950 Add accessor for buckets scanned in ScanData
Bug: 27506257
Change-Id: I9f7ae27ef8416de5e1b00dc63ee458e9e2ba69ab
2016-03-25 17:57:32 -07:00
Rebecca Silberstein
cd7167db2d Add hasEverConnected to NetworkStatus object
Add a boolean indicating if we have ever successfully connected to a
network given the current configuration.  This value should be set to
true upon a successful connection and set to false if the credentials
change.  The default value is false.

BUG: 27855896
Change-Id: I1af8f4ad7aac622b48f3c90d88b0debd671a1f40
2016-03-25 17:35:58 -07:00
Mitchell Wills
261eb97864 Merge "Add bucketsScanned to ScanData" into nyc-dev am: fb2d2ce
am: 673e919

* commit '673e919ab8445322927aacb527219c5615d5008f':
  Add bucketsScanned to ScanData
2016-03-25 20:35:04 +00:00
Mitchell Wills
fb2d2cec7b Merge "Add bucketsScanned to ScanData" into nyc-dev 2016-03-25 20:26:50 +00:00
Paul Stewart
6562973abb Merge "WifiConfiguration: Remove dead commented code" into nyc-dev am: 0a835f6
am: cfd8e79

* commit 'cfd8e797874ed3446f28dd6ec0f890d5f6b86211':
  WifiConfiguration: Remove dead commented code
2016-03-25 03:48:46 +00:00
Paul Stewart
0a835f6e43 Merge "WifiConfiguration: Remove dead commented code" into nyc-dev 2016-03-25 03:42:10 +00:00
Paul Stewart
e8ea325716 WifiConfiguration: Remove dead commented code
Nobody uses this code.  Let's clean up.

Bug: 27054653
Change-Id: I7b3dccd09de270de6fd5a17da3217495dbce421a
2016-03-24 14:56:28 -07:00
Samuel Tan
a3354f48a8 Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev am: a70cbf7
am: 9ec0fcd

* commit '9ec0fcdac4e50cdb02164cd3b32298d691995910':
  ScanResult: add clarifying comments to |flags| and |capabilities| fields
2016-03-24 17:53:15 +00:00
Samuel Tan
a70cbf7f9c Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev 2016-03-24 17:46:22 +00:00
Jeremy Joslin
6142c8ef76 Merge "Add meteredHint to WifiConfiguration." into nyc-dev am: 52f0ea5
am: 8162d59

* commit '8162d59ba97f7bdc0977782de6b59b74411b3d15':
  Add meteredHint to WifiConfiguration.
2016-03-24 17:35:09 +00:00
Jeremy Joslin
52f0ea56db Merge "Add meteredHint to WifiConfiguration." into nyc-dev 2016-03-24 17:27:54 +00:00
Samuel Tan
40b5617e15 ScanResult: add clarifying comments to |flags| and |capabilities| fields
Add internal comments to the |flags| and |capabilities| fields of
ScanResult to clarify their relationship to the fields in the per-BSS
scan results from WPA supplicant.

BUG: None
Change-Id: I8685283f8cc1006ffd22f2cb2ee8f8605cc0fd2b
TEST: N/A
2016-03-23 14:42:49 -07:00
Mitchell Wills
0d193b4453 Add bucketsScanned to ScanData
Bug: 27506257
Change-Id: I3ac7c2030188798ba3398de1a1253195475116f8
2016-03-22 16:53:13 -07:00
Paul Stewart
59ff8a11bc Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev am: 68ffbba
am: 366f851

* commit '366f851e35019816f278de6307c5aec87bbe569f':
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:31:06 +00:00
Paul Stewart
68ffbba158 Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
* changes:
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:23:48 +00:00
Paul Stewart
cbeae0f3d3 Merge "WifiManager: Defer Async Channel init" into nyc-dev am: ec1e5e8
am: e171539

* commit 'e171539d4e34c275a69cac794928a11118c04f7f':
  WifiManager: Defer Async Channel init
2016-03-22 19:45:33 +00:00
Paul Stewart
ec1e5e80fc Merge "WifiManager: Defer Async Channel init" into nyc-dev 2016-03-22 19:35:07 +00:00
Jeremy Joslin
f0c9b8c68f Add meteredHint to WifiConfiguration.
Adding a new field, meteredHint, to WifiConfiguration so that it
can be passed through and eventually used to set the meteredHint
field on WifiInfo.

BUG: 27120794
Change-Id: If08966c6a5e8eab0905f3335b1c6822975b2f0b5
2016-03-22 07:56:45 -07:00
Paul Stewart
38d1133fad Merge "Fix string equality comparison" into nyc-dev am: 0c66db8
am: da84dd2

* commit 'da84dd278d092de17943cfbd1a49592f666d89ea':
  Fix string equality comparison
2016-03-21 21:58:35 +00:00
Paul Stewart
c12bb1dd8c Fix string equality comparison
Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
2016-03-21 11:47:42 -07:00