drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
296,745 Commits 1 Branch 0 Tags
Commit Graph

1692 Commits

Author SHA1 Message Date
Steve Malkos
a2614dd6cc Merge "Expose RTT capability APIs for secure RTT." into nyc-dev am: 53afdf2 
am: 0330f40

* commit '0330f40745b64546c7fa8a1bb1c83c2a152a932f':
  Expose RTT capability APIs for secure RTT.

Change-Id: I5c4d7c0ebd4ee28ddef38f69291353b78c16125e
 2016-04-15 20:20:53 +00: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
Mitchell Wills
fad06ee67b Merge "Connect WifiScanner synchronously without sync barrier" into nyc-dev am: 2657981 
am: 740c433

* commit '740c433b5991055bc254dd1106858cf2a1943d17':
  Connect WifiScanner synchronously without sync barrier

Change-Id: I029b69e1ff1cb987ec88ac331192d3598db65d7e
 2016-04-15 18:25:12 +00: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
6ee90b5eee Merge "Fixed incomplete OSEN config code." into nyc-dev am: 82f3053 
am: c9c4f97

* commit 'c9c4f9771665f9a64512cd399cb86600a7be3f02':
  Fixed incomplete OSEN config code.

Change-Id: I42c9809b86a55c3bb6e04b78f82d7e74cfc007d0
 2016-04-14 18:35:56 +00:00
Jan Nordqvist
82f3053476 Merge "Fixed incomplete OSEN config code." into nyc-dev 2016-04-14 00:21:42 +00:00
Mitchell Wills
e852018db5 Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev am: 3c58709 
am: 53560db

* commit '53560db137aeab0a25c6a81c61da4426a676ce37':
  Make WifiScanner state not static and use ConnectivityThread

Change-Id: If2d49d771b63e0fd1bd96bdd976048da9435648a
 2016-04-13 18:56:25 +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
ae48c08a0c Merge "Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()" into nyc-dev am: 49a1c08 
am: e760bc7

* commit 'e760bc7c541c5e333f275d446c8725d370c75e9a':
  Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()

Change-Id: I83d5716166bb39a88698ea1922e343e58f6dd04d
 2016-04-11 20:03:59 +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
Etan Cohen
433c5848cf [NAN] Add type and nullability annotations. Update hide annotation. 
am: d775a16

* commit 'd775a164c37294ee97f902792aa75da41d3ccf82':
  [NAN] Add type and nullability annotations. Update hide annotation.

Change-Id: Ied809f8825ee49f50dd0108c2cdbeb328bd35aef
 2016-04-08 18:50:15 +00:00
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
d775a164c3 [NAN] Add type and nullability annotations. Update hide annotation. 
Additional annotations on (what are planned to be) public APIs.
Fixed exposed API: @hide to a few new methods.

Bug: 27122760
Change-Id: Iea91de1b1c3c32a93378b5d90c1e88d994a10526
 2016-04-08 10:18:37 -07: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
Jan Nordqvist
61b5a76893 Fixed incomplete OSEN config code. 
Bug=27929688

Change-Id: I8f4a0415576e6dc35d735fa46dc50591478403af
 2016-03-31 09:43:49 -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