1343 Commits

Author SHA1 Message Date
Adam Lesinski
0d47f4b646 Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev 2016-04-18 23:27:10 +00:00
Wei Wang
f49b51e000 Merge "Use ConnectivityThread for RttManager." into nyc-dev 2016-04-18 21:17:25 +00:00
Adam Lesinski
010bf374d8 BatteryStats: Introduce Async external stats requests
Instead of calling out to external processes with a blocking IPC,
pass along a Binder on which the external process can pass back
the response. The calling process can then wait for the reply with
a timeout.

This eliminates watchdog restarts of the system_server when an external
process like telephony or bluetooth hangs.

Bug:26842468
Change-Id: I1b242e4ed22a63f1a4a0be8c78de8ac4d7bf56c5
2016-04-15 15:27:52 -07:00
Jeremy Joslin
e9f5cd3784 Merge "Added useExternalScores field to WifiConfiguration." into nyc-dev 2016-04-15 20:14:03 +00:00
Steve Malkos
53afdf2935 Merge "Expose RTT capability APIs for secure RTT." into nyc-dev 2016-04-15 20:03:22 +00:00
Wei Wang
bd3353a6c4 Use ConnectivityThread for RttManager.
Bug:27432949

Change-Id: I80fc02ff78981ca4798844c4d869b0eb60fbd84b
2016-04-15 12:45:34 -07:00
Jeremy Joslin
fc8601310d Added useExternalScores field to WifiConfiguration.
Bug: 25562019
Change-Id: Ie3b02875b74f6decb1d4be0107a5a8161f66d657
2016-04-15 09:10:46 -07:00
Wei Wang
cae1be2200 Expose RTT capability APIs for secure RTT.
Bug: 28199253
Change-Id: I790b72a365f788ef225566e7fc13b3e097f346b2
2016-04-14 15:47:42 -07:00
Mitchell Wills
0ed524dee8 Connect WifiScanner synchronously without sync barrier
This allows the WifiScanner constructor to be called from the Looper
that is associated with the provided handler instead of relying on the
provided looper to execute initialization async.

Bug: 27695292
Change-Id: Id30dbb8d181971035a0b3f76dd485875e9d03ca3
2016-04-14 15:27:44 -07:00
Jan Nordqvist
82f3053476 Merge "Fixed incomplete OSEN config code." into nyc-dev 2016-04-14 00:21:42 +00:00
Mitchell Wills
3c5870912b Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev 2016-04-13 18:41:55 +00:00
Mitchell Wills
91312c7cb2 Make WifiScanner state not static and use ConnectivityThread
Bug: 27432949
Change-Id: I3fa14b75ee6a48aea2bfb8fed662c37b678e3cf0
2016-04-12 20:59:24 +00:00
Samuel Tan
44a4668b45 Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()
This renaming better reflects how this method is a setter, and
supports variable renaming taking place in WifiConfigManager and
WifiStateMachine.

BUG: 28088867
Change-Id: Ic2f7a1f53ffec4072e556d2831bfdcff9fef1ad7
TEST: 'runtest frameworks-wifi' passes.
2016-04-08 12:50:23 -07: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
429b9fcb7b Merge "Enable/disable WifiConnectivityManager at runtime" into nyc-dev 2016-04-07 17:22:49 +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
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
Jan Nordqvist
61b5a76893 Fixed incomplete OSEN config code.
Bug=27929688

Change-Id: I8f4a0415576e6dc35d735fa46dc50591478403af
2016-03-31 09:43:49 -07: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
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
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
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
174b140dfe Merge "Add hasEverConnected to NetworkStatus object" into nyc-dev 2016-03-29 16:04:35 +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
fb2d2cec7b Merge "Add bucketsScanned to ScanData" into nyc-dev 2016-03-25 20:26:50 +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
a70cbf7f9c Merge "ScanResult: add clarifying comments to |flags| and |capabilities| fields" into nyc-dev 2016-03-24 17:46:22 +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
68ffbba158 Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev
* changes:
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
2016-03-22 22:23:48 +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
c12bb1dd8c Fix string equality comparison
Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
2016-03-21 11:47:42 -07:00
Paul Stewart
bf8cbb05e0 WifiManager: Use ConnectivityThread
Instead of minting it's own hander thread, have WifiManager use
the looper from ConnectivityThread.

Bug: 27432949

Change-Id: Iddeebeb8ab506c912f526c7569f304e10b9d7ab8
2016-03-19 10:05:06 -07:00
Paul Stewart
75f129e17b WifiManager: Defer Async Channel init
Now that WifiManager instances are separate and do not depend
on a single static AsyncChannel for the entire process, all
contexts within a process will create an async channel on init.
Since creating this channel requires special permissions that
some applications do not have, it is problematic for them all
to request it in the process of getting a WifiManager instance.

This CL defers AsyncChannel initialization until it is actually
going to be used.  This allows callers to create WifiManager
instances without necessarily creating an AsyncChannel.
Depending on what parts of the API will be used, some callers
will never need one.  Also, this means that these apps will
not run afoul of permissions exceptions that do not apply to
them unless they actually request functionality that requires
the AsyncChannel.

While here, this CL no longer catches SecurityException while
requesting a messenger from WifiService. That hack appeared to
be an artifact of the static instance of sAsyncChannel -- it
was not clear to WifiManager which context had permissions to
successfully create the messenger, so it was necessary to
silently fail the attempt especially since that attempt was
made in the constructor.  With the restructuring to keep
mAsyncChannel per-instance and now only created at the time
specific API calls require it, a SecurityException is
completely relevant to the caller and should not be discarded.

Bug: 27694933
Test: Boot full image, repro b/27694933 with com.google.android.music

Change-Id: I680bf2443bc5b057e629544a687f985261201ded
2016-03-19 10:05:06 -07:00
Roshan Pius
42e606250a Add new wifi tx power levels in Wifi activity energy
BUG: 27227497
Change-Id: I66db7f61a5e3a8223a008f7182bb56921145c831
2016-03-16 14:26:15 -07:00
Roshan Pius
3ec7cfeedf Add new wifi tx power levels in link layer stats
BUG: 27227497
Change-Id: I48dd88d2ab5ade8e5ad9bafa153925f4d55aba26
2016-03-16 14:07:23 -07:00
Etan Cohen
2a73c7fb2a [NAN] Refactor session lifecycle to clarify API & eliminate race conditions [DO NOT MERGE]
Bug: 27257965
Change-Id: I4d7eaa6fa1f089bed2e9185f59a37f59b530975d
2016-03-15 16:03:03 -07:00
Wei Wang
e1e3d99c46 Merge "Fix device reboot when ranging empty params." into nyc-dev 2016-03-15 21:32:03 +00:00
Etan Cohen
a5ed693788 [NAN] Removed NAN event registration - dispatch all callbacks. [DO NOT MERGE]
All events dispatched by default - there's no reason to ignore events.
The specific identity changed events for which there are use-cases to
get or ignore is controlled through a new configuration.

Bug: 27607613
Change-Id: I289a36157b55270c58311a016ef79f8746e0e0a0
2016-03-14 18:21:34 -07:00
Etan Cohen
8414f5cf2b [NAN] Consolidate publish/subscribe callback sets into single set [DO NOT MERGE]
Merge onPublishFail & onSubscribeFail into onSessionConfigFail.
Merge onPublishTerminated & onSubscribeTerminated into onSessionTerminated.
A session is either publish or subscribe (never the two) so redundant.

Bug: 27610709
Change-Id: I0282d17db88754428da25ee5f064b9a4805f9736
2016-03-14 18:21:34 -07:00
Etan Cohen
e393f57d0d [NAN] Replace session callback configuration control [DO NOT MERGE]
Controlling session callback invocation:
- Remove event registration
- Add configurations to the subset (actually just termination) which
  can be configured through the HAL

Bug: 27607613
Change-Id: I608314cc2a9b077b4d5a2d2d0d315d55c6a7724b
2016-03-14 18:21:34 -07:00