Wink Saville
89d16f7597
am 9b7b4450: am 02eab434: am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev
...
* commit '9b7b4450185e723dc7021f7e8bae4a12d4dd5606':
If in a mobile captive portal is detected enable fail fast.
2013-08-08 17:10:34 -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
Vinit Deshapnde
c249c2cc6b
Use a single socket to communicate with supplicant
...
This helps to prepare for future updates from external sources.
Bug: 9298955
Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit fb40801ed8c217ae01082fb1cbd0c30bbf5532ac)
2013-08-08 18:38:53 +00:00
Jason Monk
602b232a06
Add PAC File support for proxy configuration
...
PAC (Proxy auto-config) files contain a single javascript function,
FindProxyForURL(url, host). It gets called to determine what proxy should be
used for a specific request.
This adds PAC support to the system. The ProxyProperties has been modified
to hold the PAC file when one is present. The Proxy method
setHttpProxySystemProperty has been modified to insert a PacProxySelector
as the default ProxySelector when it is required. This new ProxySelector
makes calls to the ConnectivityService to parse the PAC file.
The ConnectivityService and the WifiConfigStore have been modified to support
saving the extra PAC file data.
The ConnectivityService now has a class attached (PacProxyNative) that
interfaces to the native calls for PAC files. The parsing of the PAC file
is handled by libpac (which is being added to external/) which utilizes
libv8 to parse the javascript.
As a fallback to applications that don't use the java ProxySelector, the proxy
is setup to point to a local proxy server that will handle the pac parsing.
bug:10182711
Change-Id: I5eb8df893c632fd3e1b732385cb7720ad646f401
2013-08-07 21:01:39 -04: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
e899d7c029
am 5d6b7db5: am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
...
* commit '5d6b7db5d9cb7de5cee45dd35af18e179f01d583':
When wifi wants ASCII lowercasing, it needs to ask for it.
2013-08-02 09:50:44 -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
David Christie
6942a1200c
Add WorkSource capability to WifiManager for starting a scan.
...
Change-Id: I011bf3b91fbddaba7ab0128bb03d27d90b8a886f
2013-07-25 15:25:07 -07:00
Dmitry Shmidt
5ab422bfa3
wifi: Add tdls_discover command to tdls enable call
...
Bug: 8539031
Change-Id: I29739e74f73b68fbf9ff73cfc19017a01655f9a4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-07-16 12:41:22 -07:00
Vinit Deshapnde
e088428400
Merge "Allow enabling TDLS on specific routes"
2013-07-12 00:58:07 +00:00
Robert Greenwalt
d76a6851a8
am 6f2b31fc: am 56a7e4ad: am 116d4665: Merge "Block Wifi P2p discovery while doing dhcp." into jb-mr2-dev
...
* commit '6f2b31fcf57e4e7f5cd8af9b66619c8f5825a850':
Block Wifi P2p discovery while doing dhcp.
2013-07-11 17:12:35 -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
Vinit Deshapnde
64f0d5ba15
Allow enabling TDLS on specific routes
...
This change exposes couple of internal APIs to enable TDLS between local
machine and a remote machine. The implementation translates client provided
remote IP to a MAC address using system ARP cache, and then instructs the
driver to enable TDLS with that endpoint. Another API takes application
specified MAC address.
Bug: 8538898
Change-Id: Ida343fc42ba3a817a4f380255596e7fb7fcdfb9b
2013-07-11 15:12:44 -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
Vinit Deshapnde
b8d116a580
Flush scan results et al after band change
...
This change flushes all bss data after a band change (because it
is potentially invalid). We do scan for new data just after we've
established connectivity on the new band.
Bug: 7053587
Change-Id: I8ab9d0bbc5c3f8f383c2b7868349634085cf94c1
2013-07-09 10:42:38 -07:00
Robert Greenwalt
505e35bca9
am c869696e: am 65f7a95f: am 2f50097a: Merge "Fix power issues around wifi scans." into jb-mr2-dev
...
* commit 'c869696ef3c1dca3efbc6ce8ab804e8a1b117900':
Fix power issues around wifi scans.
2013-06-26 11:54:55 -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
e36b93575f
am 7bc28ed7: am e6345a19: am 9233fc00: Revert "Revert "wifi: Get full scan results""
...
* commit '7bc28ed76b9a6591bdda37b472c3f7dc1ffae987':
Revert "Revert "wifi: Get full scan results""
2013-06-20 20:16:51 -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
9c5c31d228
am 2a155213: am 66acbc22: am 0dff78aa: Merge "Revert "wifi: Get full scan results"" into jb-mr2-dev
...
* commit '2a155213c85f84a944551c09c0eefde3368267db':
Revert "wifi: Get full scan results"
2013-06-18 18:21:50 -07: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
Dianne Hackborn
91268cf21e
More work on process tracking.
...
Re-arranged code to be more flexible, now track
state of services, dump ordered list of running
processes while memory was critical and low.
Also rename battery stats service from "batteryinfo" to "batterystats".
Change-Id: I0f4f0c8d443c49d255cb84d0fc917e8ec18b152e
2013-06-14 17:30:17 -07:00
Jeff Sharkey
fea17de7aa
Explicit locale when formatting machine strings.
...
Bug: 9390451
Change-Id: I3581c53407554a1dffd541fb42b06d68f20a7be0
2013-06-11 14:36:41 -07:00
Robert Greenwalt
156cf40148
am 66c7bd54: am 0161d229: Merge "Remember wifi country that\'s set before boot" into jb-mr2-dev
...
* commit '66c7bd54046c567de5e3a4d332987a28ecb78092':
Remember wifi country that's set before boot
2013-06-01 09:52:18 -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
b61e757ffb
am 466ceb46: am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
...
* commit '466ceb463f44f72bdd73764e50dcb34c174a0cfe':
Ignore outstanding delayed shutdown on restart
2013-05-28 21:25:44 -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
Dmitry Shmidt
fa0e6d5231
wifi: Use 'IFNAME=iface CMD' instead of 'CMD interface=iface Rest'
...
Change-Id: Iad7389a9030c9f8a697b147941a8f296db6eb08d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-05-23 13:19:37 -07:00
Robert Greenwalt
a75ab0337a
am c3de50cd: am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev
...
* commit 'c3de50cd3cff76082bc01b04a8a6bbde300d725e':
Add some temp wifi debugging output
2013-05-19 12:51:47 -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
a67a1f5ae0
am 23abefef: am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev
...
* commit '23abefef00b4d47bb97b2597f74c9dae6a169286':
Remove wifi scan-always dialog.
2013-05-13 14:19:07 -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
77a0c9d7bc
am b4fd1bd7: am de1361fa: Merge "P2P: Turn OFF PS-mode for DHCP session" into jb-mr2-dev
...
* commit 'b4fd1bd7748d2df00ec0792d3419aa79c742f979':
P2P: Turn OFF PS-mode for DHCP session
2013-05-11 09:54:45 -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
Dmitry Shmidt
ed268e7fd4
am 509b51aa: am 00ee47ea: Merge "framework/base: Handle ASSOC-REJECT events"
...
* commit '509b51aa2560d47bcf64d63a1347b7ba8136450e':
framework/base: Handle ASSOC-REJECT events
2013-05-10 16:16:38 -07:00
Robert Greenwalt
1483631c2f
am a62fbd31: am 408ad99d: Merge "frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails."
...
* commit 'a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee':
frameworks/base:Fix for P2P GO beaconing when 4-way Handshake fails.
2013-05-10 16:16:30 -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