Commit Graph

810 Commits

Author SHA1 Message Date
Lorenzo Colitti
cee3e458d2 Merge "Don't update routes if Dhcp fails." into jb-mr2-dev 2013-03-15 18:06:20 +00:00
Robert Greenwalt
0c0db62a64 Don't update routes if Dhcp fails.
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
2013-03-15 10:48:46 -07:00
Lorenzo Colitti
3989de8e16 Fix build.
Change-Id: Iac84a5f35d7fcaebd096e605a4590f8c90fe97b0
2013-03-16 02:42:30 +09:00
Lorenzo Colitti
a37623584e Merge "Set routes from stacked links as well." into jb-mr2-dev 2013-03-15 17:14:43 +00:00
Lorenzo Colitti
ba01646777 Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev 2013-03-15 17:09:00 +00:00
Lorenzo Colitti
e43b6c4eb3 Set routes from stacked links as well.
Currently, ConnectivityService adds and removes routes to/from
the routing table only based on the LinkProperties's routes.
Make it update routes based on the stacked links as well.

Bug: 8276725
Change-Id: I9a2adf537af5a04de0aaab3780afbcc3bb5c6acb
2013-03-15 14:35:38 +09:00
Lorenzo Colitti
c080312552 Add stacked interfaces to LinkProperties.
Bug: 8276725
Change-Id: I2f592d4c690e9af0459ae742ab16107a10d89353
2013-03-15 14:35:32 +09:00
Wink Saville
93c1d17a1a Revert "Fail fast if somebody is adding default routes"
This reverts commit 24efb41874

Mako wouldn't boot for me, reverting for now.

Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7
2013-03-15 05:07:04 +00:00
Robert Greenwalt
24efb41874 Fail fast if somebody is adding default routes
bug:2655011
Change-Id: I25da940e024825bc6e1d1ac5fe7b0d951609c1c1
2013-03-14 13:16:04 -07:00
Robert Greenwalt
92abc7f76f Add logging to track down bug
bug:8377625
Change-Id: Ifd0c4081a2f1238dbbc39c6904b993e2fb95455a
2013-03-13 16:38:46 -07:00
Lorenzo Colitti
644b93ecd2 Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev 2013-03-12 22:04:52 +00:00
Lorenzo Colitti
8ec0b8a5d6 Unit test routes with interfaces in LinkProperties
Change-Id: Ie41a56bc9863ee72f4d7a8f72e436fc57e57b1af
2013-03-12 15:01:05 -07:00
Lorenzo Colitti
53de3366aa Remove redundant parameter to modifyRoute
modifyRoute takes both an interface name and a LinkProperties.
This is redundant because all callers get the interface name
from the LinkProperties. Make modifyRoute get the interface
name from the LinkProperties instead.

Change-Id: I41ba8e0a10241c2f1107204fcaca2be74556042b
2013-03-12 07:39:59 +09:00
Lorenzo Colitti
fb47594d3b Unbreak documentation build.
Change-Id: I1e904b111e23d221dcb5f917201d4c27f0c1c05b
2013-03-12 04:30:47 +09:00
Lorenzo Colitti
7a43b0f7cf Always specify an interface for host routes.
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581
2013-03-08 16:41:25 -08:00
Lorenzo Colitti
73b9785a15 RouteInfo changes.
- Add the interface name.
- Fix a bug where a default route would match an address of
  another protocol (e.g., 0.0.0.0/0 would match 2001::).
- Tweak the hashCode method.
- Write a unit test.

Change-Id: Ida8266de440a9b1d9eaa132f182b9f1ce8978c44
2013-03-08 16:41:25 -08:00
Robert Greenwalt
18fb57af46 Revert "Add default route constants to RouteInfo."
This reverts commit e610dd3e58

Change-Id: Ide6d7f3b935da41477b736ef0ef20ec9872563e1
2013-03-07 20:11:18 +00:00
Lorenzo Colitti
e610dd3e58 Add default route constants to RouteInfo.
Bug: 8276725
Change-Id: I9c3ad7393430de9275f5b1c0189a94e5a27975fc
2013-03-07 11:08:08 -08:00
Jeff Sharkey
db44d2ca9a Allow loopback traffic in lockdown mode.
Bug: 8245184
Change-Id: If993e3d6f5c7ce5970bfe701074c85b9245aa2aa
2013-02-28 16:57:58 -08:00
Robert Greenwalt
0e0ae8a849 Remove two new permission checks
These checks while technically reasonable are a hard to swallow API change
that may break existing apps and pragmatically serves no purpose:  the protected
data is available in publicly readable java VM properties.

Change-Id: I522c493c2604a33e28d99e2be31054326c9a8323
2013-02-22 15:36:33 -08:00
Robert Greenwalt
faa4b403d9 Improve ConnectivityManager docs
Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf
2013-02-22 10:39:20 -08:00
Jeff Sharkey
ee9275b9c4 Improve notification UI for lockdown VPN.
Bug: 7064111
Change-Id: I9554f6a426697b4abeb2ddd0827d314920e88ed6
2013-02-21 09:47:11 -08:00
The Android Automerger
589d0aa3ab merge in jb-mr2-release history after reset to master 2013-02-20 05:55:44 -08:00
Jeff Sharkey
760c62064b Migrate to using Mockito directly.
Change-Id: I1fcc5d1a780f5831bd6685f0735d4c0c6d245735
2013-02-19 15:28:19 -08:00
The Android Automerger
80d9e5b497 merge in jb-mr2-release history after reset to master 2013-02-19 09:51:20 -08:00
Kenny Root
7209c0bb2f am dc7b3e3b: am 012e650e: Merge "KeyStore: stop using state()"
# Via Android Git Automerger (1) and others
* commit 'dc7b3e3b6e1aa3f347c7d843ee453688c4d90e29':
  KeyStore: stop using state()
2013-02-14 12:50:34 -08:00
Kenny Root
012e650ed2 Merge "KeyStore: stop using state()" 2013-02-14 20:18:09 +00:00
Kenny Root
0ded63c2ff KeyStore: stop using state()
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
2013-02-14 12:06:51 -08:00
Russell Brenner
30fe264f5c Adjust captive portal test for setup wizard
During setup wizard, perform captive portal test without the typical
delays.

Change-Id: If596948e732966817aae6201440e87e19be0c2f8
2013-02-14 11:02:10 -08:00
Robert Greenwalt
e767d81d8f Fix a permissions probem in ConnectivityManager
stopUsingNetworkFeature fails because of new permissions checks in netd.

Change-Id: I04cb10d955c9dd9977c460c6c1db0d1910a863ce
2013-02-12 17:18:25 -08:00
The Android Automerger
06ad7f1b3d merge in jb-mr2-release history after reset to master 2013-02-12 07:10:50 -08:00
Robert Greenwalt
3874bd4930 Reintroduce the net.dns system properties <TEMP>
Removing these properties broke video playback as they used
a custom dns resolver.  We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.

bug:8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0
2013-02-11 16:22:37 -08:00
Robert Greenwalt
e41e3b3c09 Reintroduce the net.dns system properties <TEMP>
Removing these properties broke video playback as they used
a custom dns resolver.  We'll work together to resolve our
resolver issues in the future, but this was the easy fix to
get things working again.

bug:8173236
Change-Id: I687dae59eda4fc449efc34eed11c3dc88a110ad0
2013-02-11 15:25:10 -08:00
Robert Greenwalt
01495af669 Merge "Second pass tying into dns cache per interface" 2013-02-07 19:02:47 +00:00
Mattias Falk
d697aa2e38 Second pass tying into dns cache per interface
Set dns servers for secondary nets and attach the
processes (pids) that are using the secondary nets
to the secondary nets associated dns cache.

bug:5465296
Change-Id: I1eaf92d5c6b81d287e9fb2763b3d972d9de34395
2013-02-06 17:43:28 -08:00
Wink Saville
473710a912 Merge "Revert "Clean up published network condition reporting."" 2013-01-31 00:32:36 +00:00
Wink Saville
151eaa6bc1 Revert "Clean up published network condition reporting."
In some cases causes grey ICON's.

This reverts commit 2587a53c31

Change-Id: I09f893d03651c3fb9fcb88ee9e5ac7ce6cb6e273
2013-01-31 00:30:13 +00:00
Robert Greenwalt
c9083111d9 Merge "Revert "Second pass tying into dns cache per interface"" 2013-01-19 00:36:12 +00:00
Robert Greenwalt
d3aec30722 Revert "Second pass tying into dns cache per interface"
This reverts commit b101d01167

Change-Id: If52dffd5100a6b03275da0eabfa05e24c5ecada9
2013-01-19 00:34:07 +00:00
Wink Saville
2587a53c31 Clean up published network condition reporting.
Change-Id: I371c04bcb0547f1133e7ce12a6871aad3b3fdc6b
2013-01-18 09:31:13 -08:00
Mattias Falk
b101d01167 Second pass tying into dns cache per interface
Set dns servers for secondary nets and attach the
processes (pids) that are using the secondary nets
to the secondary nets associated dns cache.

Change-Id: Id865c2c3fdc0ec1c3e30c134e9ea4109f4f2fbeb
bug:5465296
2013-01-11 15:47:08 -08:00
Robert Greenwalt
b0134a39f5 Merge "Up our DNS server support from 2 > 4" 2013-01-11 15:38:03 -08:00
Robert Greenwalt
72e2243b31 Up our DNS server support from 2 > 4
bug:5958524
Change-Id: I81a9d9293049bcfc16c15ee856887aa7ed076638
2013-01-11 09:47:46 -08:00
Jeff Sharkey
f012738c73 Expose roaming flag for testing.
Change-Id: I29ef6fc59926a97f4e97c561387ac9bc0e4e4769
2013-01-03 14:07:46 -08:00
Jean-Baptiste Queru
9cbbececf4 am fe26d4e6: Merge from AOSP staging branch
* commit 'fe26d4e66574bc4bcca22a9962f25fd5b6b4ccc0':
  Return error upon attempt to use non-existent APN
  Memory leak due to bad destroy sequence
2012-12-18 15:52:45 -08:00
Jean-Baptiste Queru
fe26d4e665 Merge from AOSP staging branch
Change-Id: Iad3df4845e6fae16c4ae6dbddcad0121d4775dcd
2012-12-18 15:14:12 -08:00
Mikael Hedegren
c6534b5030 Return error upon attempt to use non-existent APN
startUsingNetworkFeature will ignore errors from
reconnect - causing ConnectivityService to send
faulty information back to requester.

Change-Id: I4e0fcc1addd84da409cdc1eed1a95d25d925e020
2012-12-18 15:32:48 +01:00
Robert Greenwalt
f909cb1535 Fix javadoc break
Change-Id: Ia69a5cbead61747537269e267dcd8da320d61ba3
2012-12-07 09:56:50 -08:00
Jianzheng Zhou
028d203d0f Refactor getPersistedNetworkPreference
Optimize for updating mNetworkPreference according to device's networkAttributes
setting from overlay config.xml when connectivityservice start.

Change-Id: I90286332d4f453038f1ddac7dd9d1265d96b4859
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2012-12-06 12:00:04 -08:00
Robert Greenwalt
402d9c853f Merge "Support for dns domain." 2012-11-16 12:56:56 -08:00