682 Commits

Author SHA1 Message Date
Robert Greenwalt
1f9ebc5fa7 am 868d4c34: am 95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '868d4c341034de6e2ebb6c1a247488b00d17c78d':
  DO NOT MERGE Sanitize WifiConfigs
2014-02-25 10:12:35 -08:00
Robert Greenwalt
950230663f DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data).  This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.

We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.

This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.

Bug:12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2

Conflicts:
	core/java/android/net/LinkProperties.java
	services/java/com/android/server/WifiService.java
	wifi/java/android/net/wifi/WifiStateMachine.java
2014-02-24 15:20:32 -08:00
Robert Greenwalt
458430d823 am 5ab9af41: am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '5ab9af410e1ba572e8ac0577c2acb5324b65d66c':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-06 17:03:59 -07:00
Robert Greenwalt
f76b5383cd DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
2013-10-04 08:19:37 -07:00
Wink Saville
9b7b445018 am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
* commit '02eab434ad9faa25291e63023b7e66698ca457a8':
  If in a mobile captive portal is detected enable fail fast.
2013-08-08 15:46:55 -07:00
Wink Saville
d747cbc898 If in a mobile captive portal is detected enable fail fast.
When captive portal checking completes pass back the result.
This is used to enable/disable failing fast for mobile. When
failing fast is enabled we don't check for data stalls and thus
won't be continually trying to do recovery operations, such as
restarting the radio.

Bug: 9462512
Change-Id: I0dea0eee519f8ee7f94e79d40e82c18f30d7fe2e
2013-08-07 16:22:47 -07:00
Elliott Hughes
ee00b353a4 When wifi wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
2013-08-02 09:07:54 -07:00
Robert Greenwalt
6f2b31fcf5 am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
* commit '56a7e4ad43eb5288a80b34566db365aaaa845e87':
  Block Wifi P2p discovery while doing dhcp.
2013-07-11 17:09:14 -07:00
Robert Greenwalt
6433ef2900 Block Wifi P2p discovery while doing dhcp.
bug:9531609
bug:9302399
Change-Id: Ie4b7c3a75245a0e7cc09fa89ddb1187d349779a1
2013-07-11 11:10:08 -07:00
Robert Greenwalt
c869696ef3 am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev
* commit '65f7a95fc4c06127e7372bcb0d14e561cc23dd80':
  Fix power issues around wifi scans.
2013-06-26 10:55:00 -07:00
Robert Greenwalt
8971084258 Fix power issues around wifi scans.
- Sending a broadcast indicating when scan requests could be serviced so that
apps don't request scans we won't do anything with.
- Fix our batt stats accounting so we only count it if we send the request to
the driver.

bug: 8868201
bug: 9496690
Change-Id: I64a4f1c294c848ac64c50d8854ed4a6a1a47f603
2013-06-26 10:00:16 -07:00
Iliyan Malchev
7bc28ed76b am e6345a19: am 9233fc00: Revert "Revert "wifi: Get full scan results""
* commit 'e6345a19129484572d3200edfff7f002a4314d0b':
  Revert "Revert "wifi: Get full scan results""
2013-06-20 20:15:09 -07:00
Iliyan Malchev
9233fc0023 Revert "Revert "wifi: Get full scan results""
This reverts commit c2cbd4c11bfb83344502bd80389538795bae03cb.

Change-Id: Ia1cbde588ae9706966d6340c702fcfe1a82cfa79
2013-06-21 03:10:20 +00:00
Iliyan Malchev
2a155213c8 am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
* commit '66acbc221b750a645a1c9581f4a5bbe52e38729c':
  Revert "wifi: Get full scan results"
2013-06-18 18:20:41 -07:00
Vineeta Srivastava
c2cbd4c11b Revert "wifi: Get full scan results"
This reverts commit 67b3fbf49c0c92641e19e3278a1feab7b68aa7b8.

Change-Id: I458924e6c95661f522ffa5e7780c6888cdb3a713

Conflicts:
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
2013-06-18 16:56:02 -07:00
Robert Greenwalt
66c7bd5404 am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev
* commit '0161d229fdbd8407f5b8b783ffa02b145b0cef8e':
  Remember wifi country that's set before boot
2013-06-01 08:58:16 -07:00
Robert Greenwalt
304aad49cd Remember wifi country that's set before boot
Telehony seems to sometimes be reporting the country before boot
is completed so can't persist the data at that time.  Remember
and write it on BOOT_COMPLETED

Also, there are permission issues around writing the setting.

bug:9225156
Change-Id: Ifdf2243da71b0d2ce5743267842597937d790ef5
2013-05-31 21:10:15 -07:00
Robert Greenwalt
466ceb463f am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
* commit 'aa4b2ee0d654b345b727cb47afd246d0b769fafd':
  Ignore outstanding delayed shutdown on restart
2013-05-28 21:23:11 -07:00
Robert Greenwalt
e9868c1ba0 Ignore outstanding delayed shutdown on restart
This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail.  Bug
is timing dependent and hard to repro.

bug:9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
2013-05-28 19:33:48 -07:00
Robert Greenwalt
c3de50cd3c am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev
* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
  Add some temp wifi debugging output
2013-05-19 12:49:44 -07:00
Robert Greenwalt
02ba86f0cc Add some temp wifi debugging output
bug: 9014777
Change-Id: I38c61f235742a36be10cdf9125e19ac9406a61b9
2013-05-18 13:40:49 -07:00
Robert Greenwalt
23abefef00 am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
* commit '28d3dbf969c4c7965ea44bfe4b54095af5356970':
  Remove wifi scan-always dialog.
2013-05-13 14:13:50 -07:00
Robert Greenwalt
28d3dbf969 Merge "Remove wifi scan-always dialog." into jb-mr2-dev 2013-05-13 21:11:32 +00:00
Robert Greenwalt
aee3d28763 Remove wifi scan-always dialog.
Removes intent type for dialog and Setting on whether to show
dialog.

bug:8907190
Change-Id: Id37e03126d4afdfd7d921132a57233b84603c8bd
2013-05-13 11:32:31 -07:00
Dmitry Shmidt
b4fd1bd774 am de1361fa: Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev
* commit 'de1361fa12cef43cc97e98321408e1c4c5e44b38':
  P2P: Turn OFF PS-mode for DHCP session
2013-05-11 09:52:41 -07:00
Dmitry Shmidt
de1361fa12 Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev 2013-05-11 16:50:38 +00:00
Dmitry Shmidt
e25f9d246e P2P: Turn OFF PS-mode for DHCP session
Bug: 8494584

Change-Id: I1d7519a40342538ab31ccad6210e47b3622ae31e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-05-10 18:13:46 -07:00
Robert Greenwalt
c77e2d74ee Fix for P2P GO beaconing when 4way Handshake fails
bug:8871100
Change-Id: I01276f13bfdd4bc23771414935d2a370223bf4fa
2013-05-10 17:03:26 -07:00
Robert Greenwalt
dfbf21e591 am 6f8fb959: Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks"
* commit '6f8fb9594fa5387340601c8b6e3e13f51e57f54b':
  Enable Opportunistic Key Caching on WPA2-Enterprise Networks
2013-05-10 15:57:06 -07:00
Dmitry Shmidt
509b51aa25 am 00ee47ea: Merge "framework/base: Handle ASSOC-REJECT events"
* commit '00ee47ead451ee2584c23f15a3760ae041e82e56':
  framework/base: Handle ASSOC-REJECT events
2013-05-10 15:57:02 -07:00
Robert Greenwalt
6f8fb9594f Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks" 2013-05-10 22:41:10 +00:00
Dmitry Shmidt
00ee47ead4 Merge "framework/base: Handle ASSOC-REJECT events" 2013-05-10 22:35:23 +00:00
Robert Greenwalt
a62fbd31b3 am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."
* commit '408ad99dd307ae93abec76821d343b8e080c99c9':
  frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
2013-05-10 15:26:30 -07:00
Partha N
ee011077df Enable Opportunistic Key Caching on WPA2-Enterprise Networks
Add a "proactive_key_caching=1" line to every network segment config that represents a
WPA2-Enterprise network. This enables Opportunistic Key Caching for all eligible
WLANs.

Replaced TABs with spaces.

Change-Id: Ia529dcd1dee7a21a68c80de05a9f590ddd944d4c
Signed-off-by: Partha N <parthan@gmail.com>
2013-05-10 07:53:26 -07:00
Deepthi Gowri
c1b631e757 framework/base: Handle ASSOC-REJECT events
Disable current network and enable other saved networks(if any)
once number of ASSOC-REJECTs on an attempt to connect to a corresponding
network exceeds the threshold.

Change-Id: Iac3c1596aa800d93c55b0ac5d8070a058c3842bd
2013-05-09 11:30:26 +05:30
Deepthi Gowri
975b788dab frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
Fix for P2P GO beaconing when 4-way Handshake fails by setting
p2p_group_idle timeout of 10 sec when group is started as a GO
and clear it when AP_STA_CONNECTED event is received.

Change-Id: I40189efc31eeb55e01a95a2a8e9c1a95d929952d
bug: 8871100
Signed-off-by: Deepthi Gowri <deepthi@codeaurora.org>
2013-05-09 00:15:33 +00:00
sunil duttu
aff3bd69d3 framework:When turn off of SoftAp immediately call turning ON SoftAp
Due to sub system restart,There is state change of softAp tether state machine
in tethered state triggering turnoff SoftAp this should be
follwed by turnon softap.

Change-Id: I93051f17bcaae72ae0694f1f23557cc1d3bea280
2013-04-30 13:56:17 -07:00
Irfan Sheriff
cca308e3e8 Fix network reload when config is restored
With scan mode opted in, supplicant connection is not shut
down even when wifi is turned off. This is a problem since
networks need to be reloaded when wifi is turned off and turned on
and this currently happens only on a supplicant connection.

Fix to handle this for scan mode state.

Bug: 8714796
Change-Id: I7d66c39fb51018fb52e783341222cea993993893
2013-04-25 23:27:19 -07:00
Irfan Sheriff
4a1d95139a Merge "Fix NPE issues seen by CTS" into jb-mr2-dev 2013-04-19 19:43:46 +00:00
Irfan Sheriff
63e550f202 Merge "Add getters and private constructor" into jb-mr2-dev 2013-04-19 17:56:34 +00:00
Irfan Sheriff
0b4732c224 Fix NPE issues seen by CTS
Bug: 8646305
Change-Id: Ief90c76d63f60aee9a3da080cd43dd9610f3f4fc
2013-04-19 10:54:48 -07:00
Irfan Sheriff
40843589c4 Add getters and private constructor
Address API feedback

Bug: 8656930
Change-Id: Idc3dd8d8a7e633449329864e41cab58a6b193b5a
2013-04-19 10:02:49 -07:00
Irfan Sheriff
ba1311a3f6 Merge "Fix API name" into jb-mr2-dev 2013-04-19 15:56:11 +00:00
Irfan Sheriff
7ea33eac4b Fix API name
Address council feedback

Bug: 8656932
Change-Id: I92972fc3672afbc38cdeee628c04b639053f7cf3
2013-04-19 08:39:53 -07:00
Irfan Sheriff
d12a7645a3 Merge "Fix enabling networks after driver stop" into jb-mr2-dev 2013-04-16 22:00:11 +00:00
Irfan Sheriff
b8df5451f4 Fix enabling networks after driver stop
Bug: 8630194
Change-Id: If897fc1fe54bf2f35362b8482e56d98f80a3130c
2013-04-16 14:16:18 -07:00
Irfan Sheriff
ed8cdbb780 Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev 2013-04-15 22:52:33 +00:00
Irfan Sheriff
0b132962e4 Fix CTS failure due to invalid EAP update
Update EAP only when it has valid entry

Bug: 8604987
Change-Id: Ib6b10bd06c26ee91c4ecd3a231b509d728725dfc
2013-04-15 22:36:45 +00:00
Kenny Root
b2c0ff64d8 Remove old KeyStore call sites
Remove the call sites that don't have the flags specified. This is to
ensure that callers know what flags they're setting.

Bug: 8122243
Change-Id: Ifbd178fddbf8dbd8f7b821ea739a20d056ef9fa7
2013-04-12 18:09:04 -07:00
Robert Greenwalt
a05e4583af Disconnect from AP when teardown requested.
We can leave the driver running if it can't handle quick
start/stop cycles, but we must disconnect when requested.

Bug:8549078
Change-Id: Id2e930fb48ca78bb459b775cba7e9aa31a6c9941
2013-04-12 12:44:56 -07:00