History log of /frameworks/base/services/java/com/android/server/WifiService.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f82e7693ca4396435ef91c7be5348731d9e863c0 17-May-2012 Irfan Sheriff <isheriff@google.com> Merge "handleAirplaneModeToggled cleanup" into jb-dev
42d73bba668aea978259e574675f37ede80dd34e 17-May-2012 Irfan Sheriff <isheriff@google.com> handleAirplaneModeToggled cleanup

Addressing a cosmetic comment from the previous CL

Bug: 6504534
Change-Id: I04981f8b541611cb93110e8b88cd7751027060cc
/frameworks/base/services/java/com/android/server/WifiService.java
ce66556a345aacad517f8eb72ddec20160ce9d61 17-May-2012 Irfan Sheriff <isheriff@google.com> Merge "Fix persisting wifi state on setWifiEnabled() call" into jb-dev
f03d62007c252271aa30360de90a50b3a974ee8f 17-May-2012 Irfan Sheriff <isheriff@google.com> Fix persisting wifi state on setWifiEnabled() call

When somebody makes a quick setWifiEnabled calls in back to back succession,
we were missing setting the last state because we were only doing that
when wifi was in a particular state from a state machine's perspective.

This was done to handle the interaction b/w airplane and wifi and was
done in the wrong way. That part is now moved to the code which detects
airplane mode changes.

In the longer term, I want to move the whole persisting code as part of
wifi state machine which is more aware of the exact states wifi is in.

Bug: 6504534
Change-Id: I452f3f4efdeb84458dcfd280269e09ffa3844f05
/frameworks/base/services/java/com/android/server/WifiService.java
bd21b78f0f018f1ea2fc750232ffc20263baa2e0 16-May-2012 Irfan Sheriff <isheriff@google.com> Add logging to capture wifi enable

Bug: 6504534
Change-Id: I3c3a803ce5bc53f1bdae697a23b95d63db82717c
/frameworks/base/services/java/com/android/server/WifiService.java
60792375761c0b2aed11f7f2ccb60c2e59f9fec1 17-Apr-2012 Irfan Sheriff <isheriff@google.com> Log messages in dump

Remove event logging and add messages in dump

Change-Id: Ic79c68443bac9b7257644ed6941853f44a9b0661
/frameworks/base/services/java/com/android/server/WifiService.java
262f766ac8bd330008e1f0a61c1a37c64108b17c 27-Mar-2012 Irfan Sheriff <isheriff@google.com> Control suspend optimizations from framework

The suspend optimizations handling in the driver is being removed.
The framework will hence forth control when these optimizations occur -
we do this at screen off and hold a short wakelock to ensure this.

We also remove the use of the now defunct setsuspendopt command and
handle the high perf locking with the new suspend mode command.

Change-Id: Ia12e38befb2c4f85cad6612bc8f807805bd0dae1
/frameworks/base/services/java/com/android/server/WifiService.java
86a5f5b9afa97a4ed6f5a2466fb9359ea131e2fb 29-Feb-2012 Irfan Sheriff <isheriff@google.com> Enhance WPS

- Add a cancel API
- Add more error reporting on WPS
- Fix network status reporting that showed up with new implementation

Change-Id: I499796c80d16d18df95fb702d029aa7e7283b603
/frameworks/base/services/java/com/android/server/WifiService.java
d3975a917799b85cacaf382b65c5832813066b51 24-Feb-2012 Irfan Sheriff <isheriff@google.com> Fix WifiManager async API

Fix the current asynchronous API to use callback like the way
was done with p2p API.

In the process, fix the use of WPS

Change-Id: Ib6f8714cf51b3525b655948268804e7eaaf17587
/frameworks/base/services/java/com/android/server/WifiService.java
07573b32494acbabd21979d8b9584c1ed3f7a6ad 28-Jan-2012 Irfan Sheriff <isheriff@google.com> Improve Wi-Fi hand-off

When Wi-fi connects at L2 layer, the beacons reach and the device
can maintain a connection to the access point, but the application
connectivity can be flaky (due to bigger packet size exchange).

We now use Watchdog to monitor the quality of the last hop on
Wi-Fi using signal strength and ARP connectivity as indicators
to decide if the link is good enough to switch to Wi-Fi as the uplink.

ARP pings are useful for link validation but can still get through
when the application traffic fails to go through and thus not best indicator
real packet loss since they are tiny packets (28 bytes) and have
much low chance of packet corruption than the regular data
packets.

Signal strength and ARP used together ends up working well in tests.
The goal is to switch to Wi-Fi after validating ARP transfer
and RSSI and then switching out of Wi-Fi when we hit a low
signal strength threshold and waiting until the signal strength
improves and validating ARP transfer.

Change-Id: Ica593291ec7772da892f03cf45b649635b730c47
/frameworks/base/services/java/com/android/server/WifiService.java
8cef06798ef1f67641f8b15165aca39abd6c46ca 14-Dec-2011 Irfan Sheriff <isheriff@google.com> Track scan count by UID

Helps track down misbehaving apps that are initiating
too many scans

Bug:5722180
Change-Id: I0bc396cf5e68ed53b900e8a65abb56acdbd8d8a5
/frameworks/base/services/java/com/android/server/WifiService.java
afb847a4692a6e5cded8c7a330d00b70b794896a 13-Dec-2011 Irfan Sheriff <isheriff@google.com> Merge "Clean up synchronization"
e744cfff7ca5406f7bba17a14b89856c1ca83262 11-Dec-2011 Irfan Sheriff <isheriff@google.com> Clean up synchronization

- Add delayed disk write in WifiConfigStore
- Remove synchronization and keep all access to config store
throught the state machine thread

Change-Id: I53768a17895e48da7b99542ac95c6c2fddbcb021
/frameworks/base/services/java/com/android/server/WifiService.java
97ff7893321362020211fae3c5a52b95c3ec19e1 09-Dec-2011 Irfan Sheriff <isheriff@google.com> Merge "Fix wifi bring up at boot up" into ics-mr1
5401f0b87b9bdcd603c55871a37fff07ab3054d7 08-Dec-2011 Irfan Sheriff <isheriff@google.com> Fix wifi bring up at boot up

Bug: 5719176
Change-Id: Iac879fc634f6ab6289b73c46931d754bc0af2f87
/frameworks/base/services/java/com/android/server/WifiService.java
4494c906168f1b93eb9d130096036d06cfa1e291 08-Dec-2011 Irfan Sheriff <isheriff@google.com> Handle emergency call back mode correctly

Bug: 5726996
Change-Id: I5815dd402bd73c530b9ba6d545d8956064949aa2
/frameworks/base/services/java/com/android/server/WifiService.java
87f0a7b1aa3fcd688358f92389d3eeaf1ae99008 07-Dec-2011 Irfan Sheriff <isheriff@google.com> Fix CS wakelock handling

Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
/frameworks/base/services/java/com/android/server/WifiService.java
9575a1bea1787efe1686bd8562bcc70c72d01721 07-Nov-2011 Irfan Sheriff <isheriff@google.com> Convert soft ap config store to state machine

- Create thread when needed
- asynchronous interaction with wifi state machine

Bug: 5587391
Change-Id: Ie6d01b5a6b398a3fa12c384920a473e242443131
/frameworks/base/services/java/com/android/server/WifiService.java
e6daca5f53dbb872d0ba6682d0f98831a99c5d9f 03-Nov-2011 Irfan Sheriff <isheriff@google.com> Avoid quick shutdown after a driver start

Causes problems on our wext driver and potentially on cfg
based driver as well.

NLP can trigger very quick acquire and release within seconds
leading to driver switching between start and stop state.

We now keep driver up for atleast couple of minutes after a start

Bug: 5478196
Change-Id: I1b261578252c5fb9a65446241b51e5686d4d9cc3
/frameworks/base/services/java/com/android/server/WifiService.java
ce0ea1f2b92c0e47941f8ae777c676ff6fe50d22 14-Oct-2011 Wink Saville <wink@google.com> In releaseWifiLockLocked call noteReleaseWifiLock.

Bug: 5452027
Change-Id: I45786a9cfe752f02a9c2e75e5b6f35bc5dfed6ae
/frameworks/base/services/java/com/android/server/WifiService.java
31b92e28a577f2f36f30b8a95147155fec038e30 03-Oct-2011 Irfan Sheriff <isheriff@google.com> Remember wifi disable due to airplane

Add the wifi disabled due to airplane mode as a seperate settings so
that wifi is restored after a reboot when airplane mode is turned off

Bug: 5365718
Change-Id: I36a9694bbcacd5bb5f89498e4adc47c81e611da6
/frameworks/base/services/java/com/android/server/WifiService.java
651cdfcbac6245f570475991588ddc2d30265e8d 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Unhide wifi p2p API

Bug: 5247957
Change-Id: Id93e30c0cb60f361ba13a840de8f843415777336
/frameworks/base/services/java/com/android/server/WifiService.java
616f3173e08ec6110cf5766c70f84c9e031fb7d7 12-Sep-2011 Irfan Sheriff <isheriff@google.com> Emergency callback mode handling

For wifi, track ECM and shut down and restart when device
goes in ECM and out

For p2p, simply turn off when in ECM mode

Bug: 5185246
Change-Id: I5f5bf75fac3e27db1d7c412135c796f2b137263d
/frameworks/base/services/java/com/android/server/WifiService.java
489a9d81fd1458940e1ec01ba0cef36843732479 07-Sep-2011 Irfan Sheriff <isheriff@google.com> Rename WpsConfiguration to Wps

For the purpose of exposing the class as a storage for Wps
info with p2p, it is better to just call it Wps

Bug: 5247957
Change-Id: Iaebef958dd8f08fdbeb4b9d7fa5ad5527400710d
/frameworks/base/services/java/com/android/server/WifiService.java
8dc6a1b2823f374a176fb21b8a174664a5f825fa 27-Jul-2011 Isaac Levy <ilevy@google.com> Watchdog notify on explicit connect

Notifies when user explicitly clicks on wifi dialog.

Change-Id: I5eee37d68b422d748d41e9384d5006482a223dc5
/frameworks/base/services/java/com/android/server/WifiService.java
fdd5f95a817820c8e3e240718c6ef2f0d0d96613 05-Aug-2011 Irfan Sheriff <isheriff@google.com> Update scanresult capability check

Scan results now have [ESS], [IBSS] & [P2P] to represent an
access point, ad-hoc network & p2p network.

Fix open network check.

Bug: 4998496
Change-Id: I0bf3f168677b0cd8cb27297427b539e768210995
/frameworks/base/services/java/com/android/server/WifiService.java
b0c1b80f471bd49af60e7b78161d814e355a6972 20-Jul-2011 Irfan Sheriff <isheriff@google.com> Fix multicast API

Fix multicast API and disable mutlicast V6 packets at driver start

Bug: 5016558
Change-Id: I1e04a905a36045e52c785c1dc702cc246a381a57
/frameworks/base/services/java/com/android/server/WifiService.java
654f5090754e4e1bf4c1736d0a24769a15a6037e 14-Jul-2011 Isaac Levy <ilevy@google.com> WifiWatchdog rewrite to formal statemachine

Rewrote wifiwatchdog service to use net.statemachine

Change-Id: Id6fd42b13192ac2e99f842ff50e9edff1696675d
/frameworks/base/services/java/com/android/server/WifiService.java
a7bc1135c270fd4a84ab7ad45b7194e9b580300e 06-Jul-2011 Isaac Levy <ilevy@google.com> Moved WifiWatchdogService and DnsPinger

- Moved WWS and DnsPinger in prep for StateMachine rewrite
intent.

Change-Id: I912ca80d31ee2ded99eb345a2e5a55d01bd9910c
/frameworks/base/services/java/com/android/server/WifiService.java
bc7dfb58bffea133ccf6d94470a26f8d193f4890 07-Jun-2011 Isaac Levy <ilevy@google.com> WifiWatchdogService - disable bad connections

Complete rewrite of WifiWatchdogService.java. Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
/frameworks/base/services/java/com/android/server/WifiService.java
f741e679c496f7345304a6543f01d7048e31d1a7 10-Jun-2011 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of e2aa0490 to master

Change-Id: Id0448a1598fc93aca0652b29253e02586e35a067
a1396dfe7ad6ec6953f544be42d69d7804ab0fd4 09-Jun-2011 Dianne Hackborn <hackbod@google.com> am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2

* commit '021408910af170268cb486910d4dd5a7d838c2bb':
Work on issue #4518815: Compatibility mode introduces compatibility regression...
5fd2169eabd77e6bfafaf456e58051a3bafb2bca 07-Jun-2011 Dianne Hackborn <hackbod@google.com> Work on issue #4518815: Compatibility mode introduces compatibility regression...

...for Market App iRunner

There were a lot of serious issues with how we updated (or often didn't update)
the display and resource state when switching compatibility mode in conjunction
with restarting and updating application components. This addresses everything
I could find.

Unfortunately it does *not* fix this particular app. I am starting to think this
is just an issue in the app. This change does fix a number of other problems
I could repro, such as switching the compatibility mode of an IME.

Also a few changes here and there to get rid of $#*&^!! debug logs.

Change-Id: Ib15572eac9ec93b4b9966ddcbbc830ce9dec1317
/frameworks/base/services/java/com/android/server/WifiService.java
f5969553727e7a9058820291439403bb3f9b327f 08-Jun-2011 Irfan Sheriff <isheriff@google.com> am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE

* commit '5e4d0206486378ffc7d2992750e439d54df15147':
Handle AsyncChannel disconnect in WifiService
6da83d5868907f64658d51f6a59261ed16c386a1 06-Jun-2011 Irfan Sheriff <isheriff@google.com> Handle AsyncChannel disconnect in WifiService

Backport change I928544a0 to LTE branch and also handle
disconnect on WifiStateMachine channel

Bug: 4473750
Change-Id: I556330c10243a1805555f6bf6dcc7e43b78e3bfd
/frameworks/base/services/java/com/android/server/WifiService.java
e526cfb490a4c855d3b6c89096c9f606b02190f8 20-May-2011 Irfan Sheriff <isheriff@google.com> am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

* commit '5b9ceebafd36db4491a49c1f00750ce50c4d4433':
Move softap config handling to WifiConfigStore
ffcea7ae7316ab748a49f5e8f6c6798356f35719 11-May-2011 Irfan Sheriff <isheriff@google.com> Move softap config handling to WifiConfigStore

Move softap config to flat file and read/write on a seperate handler thread

Bug: 4391796

Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
/frameworks/base/services/java/com/android/server/WifiService.java
2b7f63887e39079a52592fb4507d8daaf90e8afa 25-Mar-2011 Irfan Sheriff <isheriff@google.com> Add support for supplicant SCAN_INTERVAL

Also, allow scan interval for framework and supplicant
to be configured at build time or run time

Bug: 4144882
Change-Id: I877f4bcc872597b44d3f4da85cf2bc0f16e09444
/frameworks/base/services/java/com/android/server/WifiService.java
fd10d5cf56e5b1ba7692400e4fe4ae26b61f3285 14-Mar-2011 Irfan Sheriff <isheriff@google.com> am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1

* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
Backup and restore IP and proxy settings
4aeca7c5908387bc7efb0785830aea1053264062 11-Mar-2011 Irfan Sheriff <isheriff@google.com> Backup and restore IP and proxy settings

Bug: 4081954
Change-Id: I27266637c6ade0c5c8242792176d1edae0983446
/frameworks/base/services/java/com/android/server/WifiService.java
eddeecf059e18984199c0e0da3b7b15aa5b44813 09-Mar-2011 Irfan Sheriff <isheriff@google.com> am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1

* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
Persist wifi override in airplane mode
658772f0e6bcf2b0a3e26778c2fc47accbdfeb2e 08-Mar-2011 Irfan Sheriff <isheriff@google.com> Persist wifi override in airplane mode

Persist the setting of wifi override in airplane mode
so that it can be restored on reboot

Bug: 3250824
Change-Id: I2af38c282ba55fc150fd9ef783d43600f0d4260f
/frameworks/base/services/java/com/android/server/WifiService.java
c23971b3e4f92ac31996d4f9f32eef3cb4ef65fd 05-Mar-2011 Irfan Sheriff <isheriff@google.com> Handle client loss for a full connection

Bug: 3513246
Change-Id: I928544a05702bb004457e2b0d2eeb3c34f98edf9
/frameworks/base/services/java/com/android/server/WifiService.java
ebe606fccd9293674273d5f73246e0e8e6e6ddcf 24-Feb-2011 Irfan Sheriff <isheriff@google.com> Using AsyncChannel for wifi connectivity

Change-Id: Ieee5a3a1a739238d8a6659493684f1be0cbea691
/frameworks/base/services/java/com/android/server/WifiService.java
fcc0845cf9990470d498dcaa036f0ae6487ddf34 18-Feb-2011 Irfan Sheriff <isheriff@google.com> Add support for background scanning

Background scanning (preferred network offload) allows us the
host to sleep while the dongle monitors the presence of any
preferred networks. This allows us for significant power savings
since the system does not have to wake up often to initiate
a scan

Bug: 3453021
Change-Id: I7c1dbfd0c3f717df81e4da6091c4c5657c9ec9ca
/frameworks/base/services/java/com/android/server/WifiService.java
227bec49157bc496f7c9e8e8f63c12728a448922 16-Feb-2011 Irfan Sheriff <isheriff@google.com> data activity reporting on wifi

Initial checkin, need icons to complete the feature

Bug: 3412258

Change-Id: I9a3ecc8159cc314d84707065dafe23d402409a84
/frameworks/base/services/java/com/android/server/WifiService.java
ec8d23af7372204f068aebaa1bfae87dc9260e23 17-Feb-2011 Irfan Sheriff <isheriff@google.com> Add WPA support for soft Ap

Bug: 2771935

Change-Id: Ib16c1c3b9aaccbcdf372365d3c0825bdf0680207
/frameworks/base/services/java/com/android/server/WifiService.java
af3d74c05c2ea36f8641183c9f1ddc5b9b75ff85 29-Jan-2011 Irfan Sheriff <isheriff@google.com> am cc1bd4a8: am 739f6bc6: Keep never as the default wifi sleep settings

* commit 'cc1bd4a8ea2b171059607a1dbaac65fbfd9a0c04':
Keep never as the default wifi sleep settings
739f6bc675c0caa11a1d46b18de24e6c884f723a 29-Jan-2011 Irfan Sheriff <isheriff@google.com> Keep never as the default wifi sleep settings

Bug: 3404049
Change-Id: I824b8cb7b28223cfb4eb89cabc7cb237a4e1e6db
/frameworks/base/services/java/com/android/server/WifiService.java
43e747ef59e67734392d2d189e59fb9d11901037 20-Jan-2011 Irfan Sheriff <isheriff@google.com> Add untether call during softap shutdown

Bug: 3355187
Change-Id: Ie4381648883186a216807bcd0d586ecfd00ca15c
/frameworks/base/services/java/com/android/server/WifiService.java
e4c56c9655bf936454e2f3ee434aacb403876c7d 13-Jan-2011 Irfan Sheriff <isheriff@google.com> Fix WPS to provides immediate feedback

If WPS is already active, we drop user's request
and convey an in progress message

If WPS fails to start, a failure indication is conveyed
to the user

Bug: 3316078
Change-Id: I238c55973cb29cf5c1be66197ffcb4978316cb89
/frameworks/base/services/java/com/android/server/WifiService.java
96b10d669ef01c392ad186812b30cdfe1052f897 12-Jan-2011 Irfan Sheriff <isheriff@google.com> default wifi sleep policy change

Keep wifi sleep policy as never when charged as long as
user has not changed the settings

Bug: 3038345
Change-Id: I0598af41fe0144f2dfddc5bd331bd91d91e0ffea
/frameworks/base/services/java/com/android/server/WifiService.java
65eaec88f3670384ac6c63e8c21ca13c21d2a407 06-Jan-2011 Irfan Sheriff <isheriff@google.com> Use BluetoothAdapter broadcast for coex settings

Use the bluetooth adapter broadcast so that we capture
various bluetooth profiles for both scan coex settings
and coex settings during DHCP

Change-Id: Idec41940514efe7ea9927f67b6199b4893794e2a
/frameworks/base/services/java/com/android/server/WifiService.java
8e86b89860114386e6c43f55fc034a26798b73e2 22-Dec-2010 Irfan Sheriff <isheriff@google.com> Enable networks on screen on

We now all configured networks on screen on.
Also, removed event logging for scanning and rssi polling

Bug: 2129037
Change-Id: I995893d77f8575a8d987d9d8604c8272f636d12d
/frameworks/base/services/java/com/android/server/WifiService.java
04808c294027f8bc318643a94c85a999257d7f52 14-Dec-2010 Robert Greenwalt <rgreenwalt@google.com> Fix some IpV4-only code.

InterfaceConfiguration changed to use InetAddress and stop with the string->int->string
conversions.

bug:2542681
Change-Id: I11c4954547333c43bb840fa0469ddde57b0d043b
/frameworks/base/services/java/com/android/server/WifiService.java
02fb46a297c4f645f2a30b574151401dd0978521 08-Dec-2010 Irfan Sheriff <isheriff@google.com> WPS fixes and refactor

- Allow IP and proxy set up for WPS
- Use string for WPS pin to avoid losing leading zeros
- Add a seperate WPS state machine and WpsConfiguration class

Change-Id: I87f43fff8bba0ae8ff02e5fc495a8bc628a8c8cf
/frameworks/base/services/java/com/android/server/WifiService.java
cfce303cbdd59a3883957e4bc96a0476ceeb86ac 02-Dec-2010 Wink Saville <wink@google.com> Remove the need for a token parameter from AsyncChannel.

By returning the channel object it self it is unnecessary
to have a token. Also, no current code needed it, if its
needed in the future it can be added back.

Change-Id: Ie1d2a1e885f9cd74e95663711ccefb760811bf16
/frameworks/base/services/java/com/android/server/WifiService.java
36f7413dabfab50699135019ba55151e9227f59d 05-Nov-2010 Irfan Sheriff <isheriff@google.com> add frequency band control API

Change-Id: I6cc6cdef27d493d4ef76cec17fdca7e49d9dc8d7
/frameworks/base/services/java/com/android/server/WifiService.java
090813ac95b1bd5f60f67f70bb49b0886954de09 04-Nov-2010 Irfan Sheriff <isheriff@google.com> Initiate wake up scan only in a disconnected state

When wifi is connected to an access point, we should
not wake up the device to initiate scans.

Change-Id: I1a48387a0cac7b23a8d947d8409cafc63da18d38
/frameworks/base/services/java/com/android/server/WifiService.java
ed4f28b492da3ff140bbaabbbda798a08c40ea5b 30-Oct-2010 Irfan Sheriff <isheriff@google.com> Set country code in the driver and remove channel set

With dual band support, using country code
settings is the way to go

Bug: 2936741
Change-Id: I760dce4c43b1af19ee205c28f0d287420c8d9e85
/frameworks/base/services/java/com/android/server/WifiService.java
1406bcb75150e8386b4d858f27089cc1359e7f14 28-Oct-2010 Irfan Sheriff <isheriff@google.com> Use AsynChannel for synchronous API

also cleaned up some unnecessary synchronous commands from state machine,
and fixed an issue with a synchronous WPS command

Change-Id: I55bf4379d9810e11f2ba2e03e2e703b132d1488f
/frameworks/base/services/java/com/android/server/WifiService.java
07bd5ae3911fd0c3a8692221f94e680a1e6dd3de 28-Oct-2010 Irfan Sheriff <isheriff@google.com> fix interfaceflags for softap

Change-Id: I4a4fa1e5f033c945feb64b2544b8c78618bb1f3e
Signed-off-by: jmzhu <jmzhu@marvell.com>
/frameworks/base/services/java/com/android/server/WifiService.java
5876a4273e67271f0eca607af9520f7e5abbe4f3 13-Aug-2010 Irfan Sheriff <isheriff@google.com> WifiLock extensions for high performance mode

Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: Id394d265b9876bf0230efb3d222056e9b80b44fd
/frameworks/base/services/java/com/android/server/WifiService.java
f235c5ab91b040b88ceb61beb819e15f1b19e9e4 22-Oct-2010 Irfan Sheriff <isheriff@google.com> add wps pin from device capability

Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
/frameworks/base/services/java/com/android/server/WifiService.java
385a753dead6ef15f2e30eae47f73e642b3ef7ed 21-Oct-2010 Brad Fitzpatrick <bradfitz@android.com> resolved conflicts for merge of 368fdba4 to master

Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
4b7ba09c8bf773dbd045b4bbe7831fa16e33653d 21-Oct-2010 Wink Saville <wink@google.com> Change removeNetowrk to a synchronous channel call.

Change-ID: Iad0380d56972826615e044fa2aaee418b617d732
/frameworks/base/services/java/com/android/server/WifiService.java
4f5f7c968339a83b6af98ac8893a1ac33c7aa7bc 15-Oct-2010 Irfan Sheriff <isheriff@google.com> Fix wake and scan behavior

- Add wakelock for driver start/stop to ensure a wifilock
acquisition kick starts driver. Also cleaned up state machine
driver start/stop behavior.
- Add periodic scans when driver is started to ensure wifi
reconnections when wifilock exists or when user chooses
never to sleep
- some minor clean up

Change-Id: I844eb70491d5aa2f8c8933b3d8dd01ba237ee534
/frameworks/base/services/java/com/android/server/WifiService.java
431bb2269532f2514861b908d5fafda8fa64da79 19-Oct-2010 Joe Onorato <joeo@google.com> Reduce logging.

Remember, the system and main logs are
- Shared resources
- Primarily for recording problems
- To be used only for large grained events during normal operation

Bug: 3104855
Change-Id: I136fbd101917dcbc8ebc3f96f276426b48bde7b7
/frameworks/base/services/java/com/android/server/WifiService.java
65bdf4e6342e45d5862e63342f73ada2f8a93f96 11-Oct-2010 Dianne Hackborn <hackbod@google.com> am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread

Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'

* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
ecfd7f7d9588728a4579fab8af1722cefeb32d40 08-Oct-2010 Dianne Hackborn <hackbod@google.com> Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock

WifiService needs to keep the calling identity cleared while
it is doing all of its internal work.

Change-Id: I2bd720e26efcf5ad5839693307d61e51f0658ace
/frameworks/base/services/java/com/android/server/WifiService.java
6fd771b3466687a21d4a4488167a20a4fc92351b 05-Oct-2010 Ficus Kirkpatrick <ficus@android.com> Reduce log spam.

Remove the WifiService ACTION_BATTERY_CHANGED log message.

Change-Id: Idfcdf1661f9243a9eb043419490a7138533f3357
/frameworks/base/services/java/com/android/server/WifiService.java
7440fc2e0e0257043b967a80dceb0b33797d1d12 28-Sep-2010 Jaikumar Ganesh <jaikumar@google.com> Wifi: Update code for new BT Apis.

Change-Id: I1deb0a9a1533958cdb79179bebd2d3b435b0b07c
/frameworks/base/services/java/com/android/server/WifiService.java
b974d0c8f21000354bec04dea9cc6c938cdccccd 28-Sep-2010 Irfan Sheriff <isheriff@google.com> am 6db64689: am c89dd54c: Remove logging on wifilock acquire/release

Merge commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74'

* commit '6db6468956fa6d71d68e410a532ed7b1bcaecf74':
Remove logging on wifilock acquire/release
c89dd54ceeec99173d51d1196e2c03a58f120211 28-Sep-2010 Irfan Sheriff <isheriff@google.com> Remove logging on wifilock acquire/release

Bug: 3042300
Change-Id: Ia3ce184f53bdd9afee1c78bb9c294af57364f266
/frameworks/base/services/java/com/android/server/WifiService.java
5ee89800bee7c6c755778795a536e0e2f12b85ff 17-Sep-2010 Irfan Sheriff <isheriff@google.com> Add Wifi Protected Setup support

Add WPS PBC and WPS pin method support with pin obtained
from AP

Bug: 2277571

Change-Id: I6ff8e447ab8c5e59456a55152588fd4d6386c610
/frameworks/base/services/java/com/android/server/WifiService.java
0859b764719735e4b9aea5df6051ece13e212841 07-Sep-2010 Irfan Sheriff <isheriff@google.com> Make wifi scan async. (don't auto-merge)

When an entity (NLP for example) acquires
a WifiLock and initiates a scan, scan can
get blocked until driver starts.

scan returns no useful info, scan results
are broadcast when obtained.

Bug: 2964633
Change-Id: Iaefc32bb6b82f0718285a18ac600e6bbbb096e77
/frameworks/base/services/java/com/android/server/WifiService.java
c8314b05b4f283873e65df9209f3426a201ca6ad 20-Sep-2010 Dianne Hackborn <hackbod@google.com> DO NOT MERGE. Wifi service now blames apps for its wake lock use.

Change-Id: Ic57d8f77527bbfea6a129b8f348fe9108157b4d8
/frameworks/base/services/java/com/android/server/WifiService.java
03f3cb083d708d4d3226b80ed42c9d2876a56edc 18-Sep-2010 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 1f377298 to master

Change-Id: I0d92abae3a86792b47777f795143acc0489adfe4
58e0eefeb5e2e270e2b04369bbf29fc22abda8d5 16-Sep-2010 Dianne Hackborn <hackbod@google.com> Improve power tracking of WIFI use.

We now distribute "wifi started" time across all apps that are
holding WIFI locks that cause it to be started. But only when
WIFI would not normally be running. Also have a mechanism to
distribute other WIFI work that has happened across those processes
based on their use.

Also fixed a bug where we were not retaining the CPU speed step
stats across boots...!

Change-Id: I00e3153b98429166273750512cc37e7975211ab9
/frameworks/base/services/java/com/android/server/WifiService.java
e746f03c6c8b8d0897d322ab524d545ace200fcd 14-Sep-2010 Dianne Hackborn <hackbod@google.com> resolved conflicts for merge of 53686433 to master

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
7e9f4eb2608148436cef36c9969bf8a599b39e72 11-Sep-2010 Dianne Hackborn <hackbod@google.com> Track client requests through location manager.

This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like... say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work. Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
/frameworks/base/services/java/com/android/server/WifiService.java
4e8620f868e2490782ebb960404140ea9482c91d 25-Aug-2010 Ben Dodson <bjdodson@google.com> Updated documentation for upcoming fix for @code tags

Change-Id: Id7b163179132b9cf180afecb4e9e10ee39bcd415
/frameworks/base/services/java/com/android/server/WifiService.java
d8134ff9d8178470116108bb7815fd0ab2a606a1 23-Aug-2010 Irfan Sheriff <isheriff@google.com> Clean up synchronous calls

We dont plan to have asynchronous versions of the existing
synchronous calls since we have added more powerful
asynchronous calls. Remove functionality to check for
synchronous calls.

Also, remove unused sync call for fetching status

Change-Id: I2982cb7b2aabc88a63289d49686a6e3645085263
/frameworks/base/services/java/com/android/server/WifiService.java
fae66c3ab59c741aad631e6f2dd82b77b1d4a353 16-Aug-2010 Irfan Sheriff <isheriff@google.com> DO NOT MERGE Enable all networks on screen on

Connectivity to a disabled network never happens.
An old dhcp issue for example prevents
connectivity again in future. Allow connectivity
on all networks on screen on.

Bug: 2129037
Change-Id: I42afc17ddb5cd238e46d7e50f1b6e708e107b35d
/frameworks/base/services/java/com/android/server/WifiService.java
e498475b187277309c81b38240c7e71ec049e369 19-Aug-2010 Irfan Sheriff <isheriff@google.com> asynchronous driver commands

Make some of the common driver commands scan/disconnect/reconnect/reassociate
asynchronous. We already have broadcasts to indicate results.

Change-Id: I343c6be077fb11a3d488e586ab10ab2373b269d8
/frameworks/base/services/java/com/android/server/WifiService.java
6118069b1dc4c487d02d3df5b883e756dc42b605 19-Aug-2010 Irfan Sheriff <isheriff@google.com> Fix WRITE_SECURE_SETTINGS permission issue

The refactor with the new state machine had introduced
a bug with writes to secure settings in public API for
which apps might not have permission.

Bug: 2895750
Change-Id: I7d236253201a47b836996859aa3de2806ad8a800
/frameworks/base/services/java/com/android/server/WifiService.java
8c11e952305327183db9f7be719e4c94fde15a7c 13-Aug-2010 Irfan Sheriff <isheriff@google.com> DO NOT MERGE WifiLock extensions for high performance mode

Add extension to WifiLock to allow apps to operate
in high performance mode (high power & disable suspend
optimizations for battery consumption).

Bug: 2834260
Change-Id: I8b33d307f3d569bc92ba2139b9ed224ffc147547
/frameworks/base/services/java/com/android/server/WifiService.java
c7a98341b053bd8090accca151e8f3522f2dd126 14-Aug-2010 Wink Saville <wink@google.com> Add documentation to NetworkStateTracker and a small change to the API.

Also, removed some unused NetworkStateTracker event codes.

The API change was to add context and target to startMonitor, this makes
it easier to document what the actual interface contract is.

Change-Id: If9b52486c3c281fe4794bc78417c8b03888414b1
/frameworks/base/services/java/com/android/server/WifiService.java
e04653cbd0e8303eba92088344312b827e6b0bab 09-Aug-2010 Irfan Sheriff <isheriff@google.com> Asynchronous API

Add asynchronous API for simplified connect, save
and remove.

Add a SUPPLICANT_CONFIG_CHANGED_ACTION broadcast to
notifiy a supplicant configuration change.

Change-Id: I69ae116246094de4a469cb2af5baf37e5ad4d6dd
/frameworks/base/services/java/com/android/server/WifiService.java
0d25534fed91f636def5776ddc4605005bd7471c 28-Jul-2010 Irfan Sheriff <isheriff@google.com> Split WifiStateMachine from WifiStateTracker

Notifications handled in WifiService. WifiStateTracker tracks
state for connectivity service

Change-Id: Idb0cf494898d28712af0f95f9e60c5417cd4a053
/frameworks/base/services/java/com/android/server/WifiService.java
a2a1b911a31dd94ee75e94845f762b91f1db1368 07-Jun-2010 Irfan Sheriff <isheriff@google.com> Refactor WifiStateTracker

Implement WifiStateTracker as a HSM.

Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb
/frameworks/base/services/java/com/android/server/WifiService.java
30683b2ad0754cc834ccdc07829dbf5b46563b0b 26-Jun-2010 Irfan Sheriff <isheriff@google.com> am 53dca61f: am 9005e7f4: Merge "Add setWifiApConfiguration interface" into gingerbread

Merge commit '53dca61f26f4ff348418add60599213297acc899'

* commit '53dca61f26f4ff348418add60599213297acc899':
Add setWifiApConfiguration interface
17b232b5b59ab91ab543b87e849583678a000f9b 24-Jun-2010 Irfan Sheriff <isheriff@google.com> Add setWifiApConfiguration interface

Bug: 2538623
Change-Id: I779044173a2fa0e9b851ea92aeec5ca25eb9c86f
/frameworks/base/services/java/com/android/server/WifiService.java
14f2ef4c9da27a3d58d65dc9f684c5f764ee279a 15-Jun-2010 Robert Greenwalt <robdroid@android.com> Move the net transition wakelock to ConnService.

When the default network goes down we lose the wake-on-incoming-data capability
until the new net is brought up and apps rebuild their connections. We fixed this
in Wifi, but it's a general connectivity issue, not a wifi issue so moving the
mechanism to connecitivty so other networks can use it.

bug:2734419
Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147
/frameworks/base/services/java/com/android/server/WifiService.java
afadc8b4e15d94b6a4ac7dc8ad3cdcde45836f45 11-Jun-2010 Irfan Sheriff <isheriff@google.com> Dont persist config on failure

If soft AP bring up does not go through successfully,
dont persist the config. This has the benefit of recovering
from the case where things fail on "=" and "," for SSID since
the IOCTL parsing in driver on broadcom cannot handle it
at this time.

Change-Id: Iaa60fd05972db434500753dcb59092995dab07b1
/frameworks/base/services/java/com/android/server/WifiService.java
047076d170c5a94415b5abc9c9a220840639c283 15-May-2010 Chung-yih Wang <cywang@google.com> Make the SSID field of WifiConfiguration consistent with API description.

Bug id http://b/issue?id=2684571

Change-Id: I809478991ba606252d69ef007339754ab2856416
/frameworks/base/services/java/com/android/server/WifiService.java
b2e6c01f449f3fd4effee7029518684deb4e98f6 05-Apr-2010 Irfan Sheriff <isheriff@google.com> Disable tethering when airplane mode is enabled

Tethering should be disabled when
airplane mode is enabled. Additionally,
we should restore Wifi (if it was on
before tethering was enabled) when
airplane mode is disabled.

Bug: 2567099
Change-Id: Iba2031f5ecb207954fd155c47134b39ed0167fa0
/frameworks/base/services/java/com/android/server/WifiService.java
60e3ba071d2b129906e92981d1615a46febd825a 02-Apr-2010 Irfan Sheriff <isheriff@google.com> Dont start wifi if in airplane mode

Now that wifi start is asynchronous
at the time of bring up, make sure
Wifi is not started if in airplane
mode.

Bug: 2567652
Change-Id: I947b7c8480029973bcbf028f6143aabbc88c9793
/frameworks/base/services/java/com/android/server/WifiService.java
59610c041a9cdd45e1040a7a4592af42f49d7a5d 30-Mar-2010 Irfan Sheriff <isheriff@google.com> cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo

Setting the allowed channel count in the
driver can take a long time to potentially
cause ANR in the phone process. Make the call
asynchronous

Bug: 2555117
Change-Id: Ie3c2e6f90aa0ec8ee4b85c989ccae1ca0f2b94f9
/frameworks/base/services/java/com/android/server/WifiService.java
b99fe5e622aa5419d80c02e3fab614372f44bc2a 26-Mar-2010 Irfan Sheriff <isheriff@google.com> cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo

Killing the WifiWatchdogService thread from
WifiService can cause messages to be handled on
a dead thread. Quit the thread on the broadcast
instead.

A couple of more fixes:
- Do an asynchronous bring up of Wifi. This will
allow WifiWatchdogServiceThread to be immediately
brought up, instead of relying on an update.

- There is no need to listen on supplicant connection
in wifiwatchdog anymore. We kill the thread when
supplicant connection is no more.

Bug: 2546756
Change-Id: I15a188e031bc79856c55aabdd271287b0df0377d
/frameworks/base/services/java/com/android/server/WifiService.java
a3bd409a0a5dea446bd1b6edca1b367f3f70b503 25-Mar-2010 Irfan Sheriff <isheriff@google.com> settings variable for wifi saved state

We add a variable for saving wifi state
to restore after tethering.

Bring up wifi on boot up if the state indicates so.

Bug: 2537983
Change-Id: I9c6548b93df6fcbc0cec1e6b857f7224dc6d1b2c
/frameworks/base/services/java/com/android/server/WifiService.java
bfb7bfa53847832db2a3eb05e5eff7cb974c3c7a 25-Mar-2010 Robert Greenwalt <robdroid@android.com> Update Framework to support multiple dhpc ranges

Previously we only supported a single range - this was inadequate for
multiple interfaces. Adding a second range so we can support
both usb and wifi tethering.

Also moving out of the zero-conf range as our dhcp client won't
accept ip addrs in that range (no nexus to nexus wifi action).

bug: 2537963
bug: 2533491
bug: 2538303
Change-Id: I600b421343c28c2f9839ed2076122ae3d0ff5d3d
/frameworks/base/services/java/com/android/server/WifiService.java
f91444c5e161bd0017c0a9a2a38f597da3805046 24-Mar-2010 Irfan Sheriff <isheriff@google.com> Disallow tethering disable by Wifi

Disallow Tethering being disabled by Wifi
and vice versa. We now need to explicitly
disable tethering to enable Wifi.

Bug: 2539071
Change-Id: Id34a5335e70cb7234367b4709882937a4b8cc526
/frameworks/base/services/java/com/android/server/WifiService.java
3bf504df9fc1971078fdde7eed418a0dd8f601e2 23-Mar-2010 Irfan Sheriff <isheriff@google.com> Fix WakeLock issue for driver stop

Due to message removal, wakelock could be held forever.

Do a timer only based wakelock release until we do this
more cleanly in ConnectivityService for later release.

Also, add an optimization to prevent use of wakelocks when driver is
already stopped.

Bug: 2529883
Change-Id: Ia1c2ddd44213ef3aa609855613bf155945bef8e4
/frameworks/base/services/java/com/android/server/WifiService.java
80cb598599de1f867990d6070a5b0d663369bcbc 19-Mar-2010 Irfan Sheriff <isheriff@google.com> Fix wakelock

Bug: 2413908
Change-Id: Ic7f2efa94b0ad1c561db0ffab8c531d19e6c235e
/frameworks/base/services/java/com/android/server/WifiService.java
c2f54c267b896cd1799d82be81e904a2b56c2f26 18-Mar-2010 Irfan Sheriff <isheriff@google.com> Clean up changing AP configuration

Bug: 2527293
Change-Id: I35e82e24e27349e2966f88189ebca4246ad1a354
/frameworks/base/services/java/com/android/server/WifiService.java
1a543010e5cdcd35d67dadd2ab98b60fa02d5de2 18-Mar-2010 Irfan Sheriff <isheriff@google.com> Dont disable AP for tether failures

Bug: 2524514
Change-Id: I8a59e717c5b36b83adbed43184fd45d7cbfedd9a
/frameworks/base/services/java/com/android/server/WifiService.java
9ab518ad793385f8405edf19363fe825fb64f5f8 13-Mar-2010 Irfan Sheriff <isheriff@google.com> softAp framework changes

Remove AP persist settings
Add new netd interface
Handle errors
Handle AP config change
Bug: 2413908
Change-Id: I31a1221ef5479da8d4a2620f0f0ee0b62539bc69
/frameworks/base/services/java/com/android/server/WifiService.java
44113ba31a77027a56885080fdbbda67b48c46fe 16-Mar-2010 Irfan Sheriff <isheriff@google.com> Remove reload config for priority change

Bug: 2467689
Change-Id: Icd3bb17f5b794282219dd410cb56888d10130281
/frameworks/base/services/java/com/android/server/WifiService.java
7b00978dc739ed2213ed8e511c69cfb412798109 12-Mar-2010 Irfan Sheriff <isheriff@google.com> Run WifiWatchdogServiceThread only on wifi enable

Bug: 2508997
Change-Id: Ib79ee25fcc8e39e9a1d6c5b9ef9681bc00b6d006
/frameworks/base/services/java/com/android/server/WifiService.java
0f344060096329f091af20a16d69547a47c1a9d5 10-Mar-2010 Irfan Sheriff <isheriff@google.com> Clean up native access from framework

Driver commands should be issued when driver has started.
Supplicant commands should be issued when Wi-Fi is enabled
Bug: 2339709
Bug: 2371609
Change-Id: I9ba6ddfa0cf4c4b8ca049b0eb7eaaa8edb42bad1
/frameworks/base/services/java/com/android/server/WifiService.java
a8fbe1fb74d3bd40b73c90c85ac25e5176475ca5 09-Mar-2010 Irfan Sheriff <isheriff@google.com> Re-organize access to native interface through WifiStateTracker

Bug: 2339709
Change-Id: Ibb2eeb09b83dc24897116ea15a9016f81a08d442
/frameworks/base/services/java/com/android/server/WifiService.java
4528186e0d65fc68ef0dd1941aa2ac8aefcd55a3 06-Mar-2010 Christopher Tate <ctate@google.com> Refactor android.backup => android.app.backup

Change-Id: I0b21316ff890d7f3c7d4b82837bb60670724c2e8
/frameworks/base/services/java/com/android/server/WifiService.java
5321aef4a22daef6ed01ed48d936cdd82f2e38b7 12-Feb-2010 Irfan Sheriff <isheriff@google.com> Wifi AP framework changes first pass

Bug: 2421638
Change-Id: Ic5ea8f7560a7fe5e1b0769daa5d92cc33eefc692
/frameworks/base/services/java/com/android/server/WifiService.java
8a9b22056b13477f59df934928c00c58b5871c95 27-Feb-2010 Joe Onorato <joeo@android.com> Switch the services library to using the new Slog
/frameworks/base/services/java/com/android/server/WifiService.java
102d05fa9135bef5c6b875f9a6485566b06ebd18 05-Feb-2010 Irfan Sheriff <isheriff@google.com> get DHCP IP on each connection

The IP state was not being refreshed when the supplicant transitions
from COMPLETED to ASSOCIATED to COMPLETED. This can lead to
a connected state with no real connection due to old IP settings.
The fix refreshes IP on each connection.

Bug: 2329261
Change-Id: I38cd56369ee2d8ab3e0f06f5c9f5712b9b2f35a0
/frameworks/base/services/java/com/android/server/WifiService.java
784d53e79bab67e6b08b4bfc9a2dc75cfcba9772 29-Jan-2010 Chia-chi Yeh <chiachi@android.com> WifiService: allow EAP variables to be unset using empty strings.
/frameworks/base/services/java/com/android/server/WifiService.java
cd7703712eafb68b735233146b5e13c8c8e17609 08-Jan-2010 Irfan Sheriff <isheriff@google.com> Avoid wifi disable in a UNKNOWN state

Multiple broadcast receiver unregister calls cause exception.

Bug: 2361335
/frameworks/base/services/java/com/android/server/WifiService.java
7aac5547daf54005243c5d685cf60c5a4ff74a44 23-Dec-2009 Irfan Sheriff <isheriff@google.com> Synchronize all WifiNative calls

Some of the native calls were left unsynchronized in the framework. Pre-empted IOCTL call
interrupted by another call from the framework cannot be handled in the driver.

Bug: 2310455
/frameworks/base/services/java/com/android/server/WifiService.java
43866e0c48bb0effe8805afd62b253e50ca7d591 07-Jan-2010 Doug Zongker <dougz@android.com> move some system services from gservices to secure settings

Change-Id: Ie2dfb99a2b42b2cc9310b858c044d8684e3493fa
/frameworks/base/services/java/com/android/server/WifiService.java
47cc8112c3f77637ef408ef18e48d146e8250a27 08-Dec-2009 Jaikumar Ganesh <jaikumar@google.com> am 9d3cb9bf: Merge change I204e4787 into eclair

Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2

* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
084c665421502b13271e94bd0a342b0ddbbaa7ca 07-Dec-2009 Jaikumar Ganesh <jaikumar@google.com> Fix updating Bluetooth icon on status bar and for Wifi.

Status bar uses the SINK_STATE_CHANGE intent to determine the icon.
This intent also has the device. Thus, we can get this intent for any
device and we update the icon wrongly. The same problem is with Wifi.

This was not commonly observed till now, but with the car dock changes
its easy to reproduce as we can get an incoming connection from the
car's bluetooth system. For Wifi, this will cause coexistance issues
especially with desk docks.

Dr No: Eastham
Bug: 2133530
/frameworks/base/services/java/com/android/server/WifiService.java
f75aa36fc86989ca3bae2f46207e6b897a32d7ae 23-Oct-2009 Robert Greenwalt <robdroid@android.com> Add wifi "HANGED" driver state triggering reload.

The driver can now report to us that they are hosed and we'll shut
down wifi and restart it - only to be used as a last resort.

Also fixing synch problem with updateWifiState.

bug: 2173119
/frameworks/base/services/java/com/android/server/WifiService.java
e2d155a51e68694e17fa6e27d05c928215a5dbcf 21-Oct-2009 Robert Greenwalt <robdroid@android.com> Add a new API for initing Wifi multicast filtering

Gets rid of the old method which generated Log noise.

bug: 1973855
/frameworks/base/services/java/com/android/server/WifiService.java
ceabc645d1e4c84b6f8d8b01725a6fa68719842a 13-Oct-2009 Robert Greenwalt <robdroid@android.com> am 16cb04ab: Merge change If1acb2dd into eclair

Merge commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1' into eclair-mr2

* commit '16cb04ab1cd88d917fdd34a9063fe4a9707aa5b1':
Add a little logging to diagnose wifi cycle bug
f1acb2ddcde20638d592b3cdcf61cfaf01d3df7b 13-Oct-2009 Robert Greenwalt <robdroid@android.com> Add a little logging to diagnose wifi cycle bug

Hiroshi approved (with serious code review).
bug: 2171575
/frameworks/base/services/java/com/android/server/WifiService.java
a8d15941392956c383902e715028032afb583952 09-Oct-2009 Chung-yih Wang <cywang@google.com> Support double-quote SSID in WifiService.

+ push the double-quote handling down to framework.

wpa_supplicant keeps the ssid in a quoted string in the config file. However,
the UI currently needs to handle the quoted string which makes it difficult
to handle the SSID containing the quotes. The change will move the
supplicant-specific double-quote handling from UI to framework, i.e. to
add/remove doubel-quotes in framework instead of in UI settings.
/frameworks/base/services/java/com/android/server/WifiService.java
84612ea6110267928eb159b532d52fa3328d746a 30-Sep-2009 Robert Greenwalt <robdroid@android.com> Add a delay to wifi driver stop on screen off.

We already had a delay if we were associated, but we have some race conditions
we think will be masked if we delay the driver stop for the other cases
too. Don't wait as long (2 min instead of 15).

bug: 2147260
/frameworks/base/services/java/com/android/server/WifiService.java
a99f461b98df6b88c6b0fae83b41077dde9a2228 20-Sep-2009 Robert Greenwalt <robdroid@android.com> Don't require WAKE_LOCK permission to enable wifi

The process for starting wifi was using a wakelock around a message-pass and this was causing
an exception for meer mortals (who don't have WAKE_LOCK permission).

bug: 1750535
/frameworks/base/services/java/com/android/server/WifiService.java
4337476a6669ce52549ce4a60f5e4d07f8e3033f 16-Sep-2009 Chung-yih Wang <cywang@google.com> Fix the missing part for reading enterprise fields in wifi configuration

+ refactor the enterprise fields.
/frameworks/base/services/java/com/android/server/WifiService.java
7c9bf7caa2936e8b76598be9fffea980d81c61d3 12-Sep-2009 Robert Greenwalt <robdroid@android.com> Don't init wifiChannels until after supplicant up

The supplicant can take up to 15 seconds to start - setting the number of wifi channels
immediately after requested wifi start often will fail.

Changed to set the number of channels when the supplicant is reported as alive.

bug:2083601
/frameworks/base/services/java/com/android/server/WifiService.java
005b228cdfb369d9b3b325884c0337ba5968bf8c 10-Sep-2009 Nick Pelly <npelly@google.com> API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.

This is a large batch, and covers:

-- Bluetooth Device Discovery --
BluetoothAdapter.ACTION_DISCOVERY_STARTED
BluetoothAdapter.ACTION_DISCOVERY_FINISHED
BluetoothAdapter.startDiscovery()
BluetoothAdapter.cancelDiscovery()
BluetoothAdapter.isDiscovering()

-- Bluetooth bonding (pairing) --
BluetoothAdapter.getBondedDevices()
BluetoothDevice.ACTION_BOND_STATE_CHANGED
BluetoothDevice.EXTRA_BOND_STATE
BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE
BluetoothDevice.BOND_NONE
BluetoothDevice.BOND_BONDING
BluetoothDevice.BOND_BONDED
BluetoothDevice.getBondState()
BluetoothDevice.createBond()
BluetoothDevice.cancelBondProcess()
BluetoothDevice.removeBond()

-- BluetoothClass --
BluetoothDevice.ACTION_CLASS_CHANGED
BluetoothDevice.EXTRA_CLASS
BluetoothDevice.getBluetoothClass()
BluetoothClass.Service.*
BluetoothClass.Device.Major.*
BluetoothClass.Device.*
BluetoothClass.getDeviceClass()
BluetoothClass.getMajorDeviceClass()
BluetoothClass.hasService()

-- Misc BluetoothDevice --
BluetoothDevice.ACTION_ACL_CONNECTED
BluetoothDevice.ACTION_ACL_DISCONNECTED_REQUESTED
BluetoothDevice.ACTION_ACL_DISCONNECTED
BluetoothDevice.ACTION_DISCOVERED
BluetoothDevice.ACTION_NAME_CHANGED
BluetoothDevice.EXTRA_DEVICE
BluetoothDevice.EXTRA_NAME
BluetoothDevice.EXTRA_RSSI

-- Misc BluetoothAdapter --
BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED
BluetoothAdapter.EXTRA_LOCAL_NAME
BluetoothAdapter.checkBluetoothAddress()

I deprecated BluetoothIntent and moved each intent into the class it relates
to.

Change-Id: I877b1280428ab46278b2bc25668bb44cda22dc36
/frameworks/base/services/java/com/android/server/WifiService.java
00717e2d04cc2c273da9eae4d0dfe61621c7c08d 17-Aug-2009 Mike Lockwood <lockwood@android.com> WifiService: Hash based on both SSID and BSSID in scan result cache.

Fixes problem with base stations that have multiple SSIDs.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
8d1668da94c1369f6d68e71007c3255336cb6b92 05-Aug-2009 Zheng BaoZhong <bao-zhong@motorola.com> Wifi: Fix synchronization bug in multicast lock.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
bd5ddf01e4d629982fa8bb667d4be7c5ec3aa79f 30-Jul-2009 Mike Lockwood <lockwood@android.com> Wifi: Add support for enabling Wifi while in airplane mode.

If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
d72aa3b92c206092d3b3ce563e0ebf25e1a0be07 22-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 356d4a14: Merge change 8172 into donut

Merge commit '356d4a14aa96cf52c16f7a4d381044ce28b01af3'

* commit '356d4a14aa96cf52c16f7a4d381044ce28b01af3':
Add the phase2 field for EAP WiFi configuration.
b96ea206d93b6cd7fe2106a8427d41a8e90d8322 22-Jul-2009 Chung-yih Wang <cywang@google.com> Add the phase2 field for EAP WiFi configuration.
/frameworks/base/services/java/com/android/server/WifiService.java
e2a5385c70b48b57476a0c8c52bad4ea40398641 15-Jul-2009 Mike Lockwood <lockwood@android.com> resolved conflicts for merge of f7703519 to master
f32be166d56302b59c242a1296a6b03862f3c061 14-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: Disable RSSI polling when the screen is off.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
0900f3657664d9046e6723825fd32b244eef2b6c 10-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: Keep the WLAN network interface up whenever wifi is enabled.

We now only bring it down briefly and bring it back up again when
we want to reset the interface.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
622f82a0c78aa69d9b3b29ea0617cb8002b57c16 10-Jul-2009 Mike Lockwood <lockwood@android.com> WifiService: Remove hidden AP counting logic for active/passive scanning mode.

Apparently this code was not 100% correct, and now the Wifi driver is responsible
for setting the scan mode to active for hidden networks, so this is no longer needed.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
6811355d9683412cb3651e75c59c3256ceaddcec 09-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 463aacfb: Merge change 6661 into donut

Merge commit '463aacfbd220c9ef2f6ed915d54092289fdac05b'

* commit '463aacfbd220c9ef2f6ed915d54092289fdac05b':
wifi: WifiManager.startScan() will now do passive scans by default.
a5ec95cdb1a7d2024249277dff1f99d0046c9b56 08-Jul-2009 Mike Lockwood <lockwood@android.com> wifi: WifiManager.startScan() will now do passive scans by default.

Active scans will only happen if a hidden AP is in use, or if the new method
WifiManager.startScanActive() is called.
This fixes some audio playback problems with bluetooth A2DP.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
856d080ae52edc6ceaebf2047f8fe08fb159f9c2 07-Jul-2009 San Mehat <san@google.com> am 0310f9aa: WifiService: Fix build (missing import)

Merge commit '0310f9aa21ed8714acbe56afea061596fb8f1ac4'

* commit '0310f9aa21ed8714acbe56afea061596fb8f1ac4':
WifiService: Fix build (missing import)
0310f9aa21ed8714acbe56afea061596fb8f1ac4 07-Jul-2009 San Mehat <san@google.com> WifiService: Fix build (missing import)

Signed-off-by: San Mehat <san@google.com>
/frameworks/base/services/java/com/android/server/WifiService.java
a15dd950e5d08fb015d4e57492fa68aa213eead7 07-Jul-2009 San Mehat <san@google.com> am fa6c7111: WifiService: use wifi association state to determine if we should suspend wifi instead of the existance of an IP address.

Merge commit 'fa6c7111fe58e09a92741c7655221c3629d3220e'

* commit 'fa6c7111fe58e09a92741c7655221c3629d3220e':
WifiService: use wifi association state to determine if we should suspend wifi instead of
fa6c7111fe58e09a92741c7655221c3629d3220e 07-Jul-2009 San Mehat <san@google.com> WifiService: use wifi association state to determine if we should suspend wifi instead of
the existance of an IP address.

Signed-off-by: San Mehat <san@google.com>
/frameworks/base/services/java/com/android/server/WifiService.java
47873e55268eb636b2f9ada0266a0b60f52ca365 02-Jul-2009 Amith Yamasani <yamasani@google.com> Backup Wifi supplicant data.

WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
/frameworks/base/services/java/com/android/server/WifiService.java
58c714c41ac3799b0b408affd9804056070d358c 06-Jul-2009 Chung-yih Wang <cywang@google.com> am 699ca3f2: Add password field for WiFi configuration.

Merge commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91'

* commit '699ca3f2518360ea3250ff5a0e5d39e122c64a91':
Add password field for WiFi configuration.
699ca3f2518360ea3250ff5a0e5d39e122c64a91 04-Jul-2009 Chung-yih Wang <cywang@google.com> Add password field for WiFi configuration.

1. the certtool.h is modified for avoiding the side effect,
for saving the configuration with wpa_supplicant.
2. put the loadLibrary back in CertTool.java
3. Fix incorrect JNI declarations.
/frameworks/base/services/java/com/android/server/WifiService.java
0d0012ef1617170701b9cd7492ef04ac47bfb5ca 03-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 54af78a3: Merge change 5950 into donut

Merge commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c'

* commit '54af78a3f7064e04d7ebd64c985d4149f9f7b05c':
Fix memory leaks in system_server
16d79e56ca3fe7606c48882d9b1aef6267d69124 02-Jul-2009 Amith Yamasani <yamasani@google.com> Backup Wifi supplicant data.

WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
/frameworks/base/services/java/com/android/server/WifiService.java
fff2fda0199dedbf1079454dca98a81190dce765 01-Jul-2009 Suchi Amalapurapu <asuchitra@google.com> Fix memory leaks in system_server
unlink DeathRecipients in a whole bunch of places to avoid memory leaks
/frameworks/base/services/java/com/android/server/WifiService.java
1a645058a85182371b581916deba501feaa7bb86 25-Jun-2009 Mike Lockwood <lockwood@android.com> WifiService: Update all scan result values in our scan result cache.

Previously only the level was being updated, resulting in out of date values
being left in the cache.
Patch was provided by Motorola.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
36d3ebb880e922859d4fd83792e13069072c19b2 06-Jun-2009 Android (Google) Code Review <android-gerrit@google.com> am 19cd309f: Merge change 3017 into donut

Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3'

* commit '19cd309f9eccdf8454dc6e5076013588b7a170a3':
Add the EAP related fields for WiFi configuration.
5069cc78497209c035a7019b2f407bd1ed57f64a 03-Jun-2009 Chung-yih Wang <cywang@google.com> Add the EAP related fields for WiFi configuration.

-- added the EAP/802.1X related fields in WifiConfiguration for
supporting EAP/802.1X authentication.
-- hid the related fields for now.
/frameworks/base/services/java/com/android/server/WifiService.java
96cdc61c69aa735e65295a50e3e2922425b3c877 28-May-2009 Android (Google) Code Review <android-gerrit@google.com> am 1e2e44e9: Merge change 2365 into donut

Merge commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc'

* commit '1e2e44e900cb9a25d548e27a20d65292a7f321bc':
Fix wifi multicast API for public use.
Revert "Bug fixes and performance improvements"
fc1b15cfbfc5f69235ec1f367abd7a909381cd05 23-May-2009 Robert Greenwalt <robdroid@android.com> Fix wifi multicast API for public use.

Applying API review comments and taking it public.
/frameworks/base/services/java/com/android/server/WifiService.java
b5010cc3c33c74cc406a70f34f93d330a3f0db6a 22-May-2009 Robert Greenwalt <robdroid@android.com> Add carrier/mcc factors to wifi-channel decision.

Uses ro.carrier and MCC when available to try to set
(non-persistingly) the number of allowed wifi channels.
Part of the fix for 1625953.
/frameworks/base/services/java/com/android/server/WifiService.java
58ff0217a617d5b03d18f0ef532f254f8ba6de2b 20-May-2009 Robert Greenwalt <robdroid@android.com> Increment BatteryStatsImpl's VERSION.
That'll make it stop trying to interpret older records with the new format.
Also applied other comments involving name changes to remove un-needed 'Wifi' labels in WifiManager API, etc.
/frameworks/base/services/java/com/android/server/WifiService.java
d9c32bc838cb618dcbc1e48df02a34b6596b8930 18-May-2009 Mike Lockwood <lockwood@android.com> WifiService: Wifi power management change

Put Wifi into an idle state immediately if the screen is turned off and the Wifi interface has no IP address.
We will continue to keep Wifi up for 15 minutes in the case where the screen is turned off when Wifi is fully connected.
This will allow us to go into a low power mode faster when Wifi is not actively being used.
It also avoids bringing up Wifi if the user just turns on the screen for a few seconds to check the clock, etc.

Fixes bug b/1736920

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
5347bd4cda2b6afc18f8acab48e52131f35ed13c 14-May-2009 Robert Greenwalt <robdroid@android.com> Add wifi multicast filter api (enable/disable).
Fixes 1833432. Automatically re-disables any request when the app
exits/crashes. Also hooked into Battery Stats for power managment analysis.
/frameworks/base/services/java/com/android/server/WifiService.java
b30475ecef84303600302b6790420bcc66631bf0 21-Apr-2009 Mike Lockwood <lockwood@android.com> WifiService: Cleanup parsing of wifi scan results.

Also add support for possitive RSSI values, fixing b/1786306

Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/services/java/com/android/server/WifiService.java
617f877c06c82584a38f41bb60d836e08c5e3bda 01-Apr-2009 Dianne Hackborn <> AI 143800: am: CL 143748 Fix issue #1743326 (More battery stats)
Adds stats for:
- Number of raw user events that have happened in the system.
- Number of times user activity has been reported, dividied by UID and type of activity.
- Duration of screen brightness levels in 4 buckets.
- Per-UID tracking of who has turned on Wifi and how long we can attribute it being on because of them.
Original author: hackbod
Merged from: //branches/cupcake/...

Automated import of CL 143800
/frameworks/base/services/java/com/android/server/WifiService.java
5711fadfc48f0e77bc25a91ef36c76acb0d2f55a 28-Mar-2009 Eric Shienbrood <> AI 143266: am: CL 143124 Fix bug #1731826, in which auto-connect to remembered networks does not
take place.
This has the same underlying cause as bug #1739874, so this fixes that
bug as well. The problem was that if the supplicant was in the DORMANT
state at the time a scan-only Wi-Fi lock was released, the command to
stop the Wi-Fi driver would never be issued. This had two main results:
first, the driver would stay awake when the screen was blank and it was
supposed to be sleeping, leading to excessive battery drain, and second,
when the screen was turned back on, there would be no DRIVER-STARTED
event generated (because the driver was already running). The
DRIVER-STARTED event is the trigger for the framework to issue a
RECONNECT command to the supplicant to cause it leave the DORMANT state
and look for available remembered networks.
To assist in tracking down this problem, and any such problems in the
future, I added four counters to keep track of how many times full and
scan-only Wi-Fi locks are acquired and released. The counter values
are output in the dump() method of WifiService. While doing this, I
noticed that because of missing "break" statements, the battery stats
that keep track of how much time Wi-Fi locks are held were including
the time for full locks in the time reported for scan-only locks.
Original author: ers
Merged from: //branches/cupcake/...

Automated import of CL 143266
/frameworks/base/services/java/com/android/server/WifiService.java
d4c5f8919b0522bcaab41a5863c313fec52d3a79 25-Mar-2009 Eric Shienbrood <> Automated import from //branches/donutburger/...@140679,140679
/frameworks/base/services/java/com/android/server/WifiService.java
105925376f8d0f6b318c9938c7b83ef7fef094da 19-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@140373
/frameworks/base/services/java/com/android/server/WifiService.java
b2a3dd88a53cc8c6d19f6dc8ec4f3d6c4abd9b54 09-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@137197
/frameworks/base/services/java/com/android/server/WifiService.java
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/frameworks/base/services/java/com/android/server/WifiService.java
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/frameworks/base/services/java/com/android/server/WifiService.java
da996f390e17e16f2dfa60e972e7ebc4f868f37e 13-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@131421
/frameworks/base/services/java/com/android/server/WifiService.java
d24b8183b93e781080b2c16c487e60d51c12da31 11-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@130745
/frameworks/base/services/java/com/android/server/WifiService.java
9266c558bf1d21ff647525ff99f7dadbca417309 16-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@126645
/frameworks/base/services/java/com/android/server/WifiService.java
b798689749c64baba81f02e10cf2157c747d6b46 10-Jan-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@125939
/frameworks/base/services/java/com/android/server/WifiService.java
f013e1afd1e68af5e3b868c26a653bbfb39538f8 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/frameworks/base/services/java/com/android/server/WifiService.java
54b6cfa9a9e5b861a9930af873580d6dc20f773c 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/frameworks/base/services/java/com/android/server/WifiService.java