Commit graph

1,072 commits

Message SHA1
am 7261e86e: (-s ours) am 4aadb99c: am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs
* commit '7261e86ef6':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-02-25 18:14:26 +00:00
ba71f589fb
am 4aadb99c: am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs
* commit '4aadb99cfb':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-02-25 10:12:35 -08:00
7261e86ef6
am 2d3f03d7: DO NOT MERGE Sanitize WifiConfigs
* commit '2d3f03d7fb':
  DO NOT MERGE Sanitize WifiConfigs

Robert Greenwalt   authored and   Android Git Automerger   commited 2014-02-25 10:09:13 -08:00
4aadb99cfb
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

Robert Greenwalt   commited 2014-02-24 15:20:32 -08:00
2d3f03d7fb
Fix NPE in ConnectivityService
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a

Robert Greenwalt   commited 2013-11-18 09:43:59 -08:00
5654cd271f
Fix for the invalid Global Proxy Setting
Adding validation for Global Proxy setting before it is
being set.

Proxy is validated at the boot time also to make sure
the value set is valid.

Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>
bug:11598568

Change-Id: Idff5ae81119d8143da096b5291ecbfbc5875cbd4

Raj Mamadgi   authored and   Robert Greenwalt   commited 2013-11-14 00:08:21 +00:00
f3df16221a
Use HttpsURLConnection to by pass proxies.
In isMobileOk attempting to connect to clients3.google.com/generate_204 we
sometimes see a proxy server will not let the connection go to our
server and instead returns 200 instead of 204. By using Https we by pass
proxy servers and we will always connected to our server.

The number of loops is increased from 3 to 4 and half the the retires
will use Http and half will use Https.

I also, added mTestingFailures which can be set to true by setting
persist.checkmp.testfailures to 1. This will cause checkMobileProvisiong
to always fail so we can test https & http.

Bug: 9972012
Change-Id: I870606037dcffe5250843980517ac52218266e02

Wink Saville   commited 2013-10-31 06:35:22 -07:00
4df83f5734
Merge "Change how we use provisioning url so post works" into klp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-10-17 23:00:42 +00:00
a03ea4847b
Change how we use provisioning url so post works
Needed to do an http post instead of a get for one carrier.
Do this by putting an auto-submitting form in the data to be
interpreted as a html doc by the browser.  The ACTION_VIEW
intent only works on http uri, but by specifying ACTION_MAIN/
CATEGORY_APP_BROWSER we could use data:text/html.

bug:11168810
Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549

Robert Greenwalt   commited 2013-10-17 12:46:52 -07:00
411dcf66c4
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-10-15 21:14:08 -07:00
df23a9b6ea
Retry captiveportal check even if only one addr
We're getting some false positive results on this check and
while it was coded to try 3 times given sufficient independent addrs
the default url resolves to a single address so we'd just try once.

Rework to try again even with fewer urls to try to reduce the false
positives.

Also adds a random query param to fool proxies into not caching.

bug:9972012
Change-Id: Ib719f40ec612065ca6bcd919549fc1164506d35a

Robert Greenwalt   commited 2013-10-15 12:43:30 -07:00
af2f34adfd
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-10-13 06:01:56 -07:00
0ee9847649
getProxy in ConnectivityService returns port w/PAC
Changes the PacManager to report message back to ConnectivityService
to send a broadcast once the download has completed.  This allows the
ConnectivityService to store the correct proxy info for getProxy().

This made the problem arise that ProxyProperties was not handling port
while it had PAC.  Added small fix for equals() and parcelization.

The combination of these fixes seems to resolve Bug: 11028616.

Bug: 11168706
Change-Id: I92d1343a8e804391ab77596b8167a2ef8d76b378

Jason Monk   commited 2013-10-10 17:01:45 -04:00
a69f1b06de
Fix issue #11113111: dumpsys activity service is broken
Change-Id: Ie02d27b377c562085ef7eb5dea144ce2f382c11d

Dianne Hackborn   authored and   The Android Automerger   commited 2013-10-09 14:34:04 -07:00
75d9bcddea
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-10-09 06:01:14 -07:00
254232b727
Merge "Fix captive portal detection on IPv6 networks." into klp-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-10-09 02:14:43 +00:00
cabdbf9fec
merge in KQS81M
Ed Heyl   commited 2013-10-08 15:40:08 -07:00
e83f730778
Fix captive portal detection on IPv6 networks.
Currently the captive portal check URL is generated by
concatenating scheme, "://", IP address, and port. This breaks
for IPv6 because IPv6 addresses in URLs must be enclosed in
square brackets (e.g., http://2001:db8::1/generate_204 is
invalid; should he http://[2001:db8::1]/generate_204 instead).
The resulting MalformedURLException causes isMobileOk to report
that there is no captive portal, even if there is one.

Fortunately the three-arg URL constructor already knows how to
construct URLs with IPv6 addresses. Use that instead of
generating the URL ourselves.

Bug: 10801896
Change-Id: I02605ef62f493a34f25bb405ef02b111543a76fd

Lorenzo Colitti   commited 2013-10-08 14:15:14 +09:00
9405beeea0
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-10-07 06:00:38 -07:00
bc0a421e8e
am 4f15276a: (-s ours) am ff23ab37: am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '4f15276a26':
  DO NOT MERGE Un-deprecate getDhcpInfo

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-06 17:11:00 -07:00
b1b99f6765
am fea09d86: (-s ours) am 0f1ac468: am f725b93f: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'fea09d8611':
  DO NOT MERGE Un-deprecate getDhcpInfo

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-06 17:10:57 -07:00
94475b9ffb
am ff23ab37: am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'ff23ab37b9':
  DO NOT MERGE Un-deprecate getDhcpInfo

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-06 17:03:59 -07:00
4f15276a26
am 0f1ac468: am f725b93f: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit '0f1ac4682b':
  DO NOT MERGE Un-deprecate getDhcpInfo

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-06 17:03:56 -07:00
fea09d8611
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-10-06 06:01:24 -07:00
31104283d3
am 88a69fc2: DO NOT MERGE Un-deprecate getDhcpInfo
* commit '88a69fc2c0':
  DO NOT MERGE Un-deprecate getDhcpInfo

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-04 14:17:18 -07:00
ff23ab37b9
am f725b93f: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'f725b93f48':
  DO NOT MERGE Un-deprecate getDhcpInfo

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-10-04 14:15:52 -07:00
0f1ac4682b
DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9

Robert Greenwalt   commited 2013-10-04 18:43:29 +00:00
f725b93f48
Merge "Un-deprecate getDhcpInfo" into klp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-10-04 18:07:34 +00:00
f917950551
Merge "Don't redirect dns to an iface without dns servers" into klp-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-10-04 18:06:13 +00:00
d5e94d8699
Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a

Robert Greenwalt   commited 2013-10-04 09:53:39 -07:00
5b1ce8a835
DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9

Robert Greenwalt   commited 2013-10-04 08:19:37 -07:00
88a69fc2c0
Use networkType to display wifi and mobile notification separately.
There are two bugs one is I was clearing the notification in
CaptivePortalTracker when entering the ActivateState. (double check
according to bug 5021626 we should be calling enter)

Second is we could have the need to display both icons but can't
because we only allow one.

The solution I'm proposing here is to allow two notifications and
have then controlled separately.

Bug: 10886908
Change-Id: I30e7130bc542535492d175640a4990c592f32806

Wink Saville   commited 2013-10-03 08:34:46 -07:00
76f49d3cee
Don't redirect dns to an iface without dns servers
bug:10115444
Change-Id: Ide42072bb3aae21f8e99c11c2de263e9a765b911

Robert Greenwalt   commited 2013-09-25 16:58:45 -07:00
b87ab96295
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-09-16 06:01:18 -07:00
66196d3804
Tighten condition for calling checkMobileProvisioning.
Add the condition that the connected network needs to be TYPE_MOBILE.
This eliminates checking on connecting to secondary networks like
FOTA, MMS, SUPL ...

This reduces unnecessary attempts to bring up multiple connections at
the same time. Especially in the light of the trouble we're having with HFA
on Sprint, where we don't want to connect to any other network until HFA
has completed.

Bug: 10758001
Change-Id: Id294536b70304a51de4752bc1a4ffac734f10f1a

Wink Saville   authored and   The Android Automerger   commited 2013-09-14 14:01:03 -07:00
06c96d07ad
Tighten condition for calling checkMobileProvisioning.
Add the condition that the connected network needs to be TYPE_MOBILE.
This eliminates checking on connecting to secondary networks like
FOTA, MMS, SUPL ...

This reduces unnecessary attempts to bring up multiple connections at
the same time. Especially in the light of the trouble we're having with HFA
on Sprint, where we don't want to connect to any other network until HFA
has completed.

Bug: 10758001
Change-Id: Id294536b70304a51de4752bc1a4ffac734f10f1a

Wink Saville   commited 2013-09-14 09:04:53 -07:00
11fa47227d
checkMobileProvisioning should not block.
In checkMobileProvisioning the call to mdst.isProvisioningNetwork() is
a blocking call and during monkey testing without SIM this is causing
ANR's. Move the initial test for provisioning into isMobileOk so
checkMobileProvisioning doesn't block.

If mobile is not supported return CMP_RESULT_NO_CONNECTION.

Cleaned up some debug.

Bug: 10674404
Change-Id: I10a0e922cd6ea9790f66e2083f37e68cb0a8861f

Wink Saville   authored and   The Android Automerger   commited 2013-09-13 19:13:21 -07:00
e6d205263f
Merge "checkMobileProvisioning should not block." into klp-dev
Wink Saville   authored and   Android (Google) Code Review   commited 2013-09-13 20:59:16 +00:00
e1b4220f8e
Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev
Jason Monk   authored and   Android (Google) Code Review   commited 2013-09-13 20:31:54 +00:00
fddacc6045
checkMobileProvisioning should not block.
In checkMobileProvisioning the call to mdst.isProvisioningNetwork() is
a blocking call and during monkey testing without SIM this is causing
ANR's. Move the initial test for provisioning into isMobileOk so
checkMobileProvisioning doesn't block.

If mobile is not supported return CMP_RESULT_NO_CONNECTION.

Cleaned up some debug.

Bug: 10674404
Change-Id: I10a0e922cd6ea9790f66e2083f37e68cb0a8861f

Wink Saville   commited 2013-09-13 12:40:11 -07:00
e14346f8f4
Guarantee that PAC Local Proxy owns Port
This changes the PAC support to not broadcast the Proxy information until
the Local Proxy has started up and successfully bound to a port so that
the local proxy information can be guaranteed to be owned by the proxy.

Bug: 10459877
Change-Id: I175cd3388c758c55e341115e4a8241884b90d633

Jason Monk   commited 2013-09-13 09:53:26 -04:00
0a9cc50662
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-09-12 06:01:29 -07:00
0d139cc267
Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90

Yuhao Zheng   authored and   The Android Automerger   commited 2013-09-11 14:39:19 -07:00
0e1e5c93a2
Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.

Jeff Sharkey   authored and   Android (Google) Code Review   commited 2013-09-11 20:16:59 +00:00
6cb013235d
Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90

Yuhao Zheng   commited 2013-09-11 09:44:28 -07:00
239a3b22f1
Request all tethering interfaces, fix corruption.
netd now tracks statistics for tethered interfaces across tethering
sessions, so switch to asking for all tethering stats.  (Currently
we're double-counting all tethering data, ever since it started
tracking across sessions.)

Also catch OOME to handle corrupt stats files, which we then dump to
DropBox and then start over.

Bug: 5868832, 9796109
Change-Id: I2eb2a1bf01b993dd198597d770fe0e022466c6b9

Jeff Sharkey   commited 2013-09-10 21:03:30 -07:00
168cd72f76
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-09-10 14:28:38 -07:00
03186cc000
Add a hidden API to toggle airplane mode.
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570

Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133

Yuhao Zheng   commited 2013-09-10 09:57:12 -07:00
b77f15d90b
merge in klp-release history after reset to klp-dev
The Android Automerger   commited 2013-09-09 06:01:43 -07:00
77ca71cce5
Merge "Tighten test for warm sim and add more debug." into klp-dev
Wink Saville   authored and   Android (Google) Code Review   commited 2013-09-09 01:32:45 +00:00
f41860989a