Commit graph android_packages_modules_Co.../core/java
Message SHA1
resolved conflicts for merge of aaf31586 to master
Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9

Robert Greenwalt   commited 2011-07-25 16:06:25 -07:00
fce7186be1
Merge "Fix USB tethering"
Mike Lockwood   authored and   Android (Google) Code Review   commited 2011-07-23 19:36:32 -07:00
865fcf3eb3
Fix USB tethering
The previous approach no longer works with the new USB drivers, since the usb0
interface is no longer enabled by default.
This introduced a chicken & egg problem - usb0 will not be enabled until the
user tries to start tethering, but Settings will not enable the checkbox unless
usb0 is enabled.
To fix this we add an explicit call to start USB tethering in the connectivity manager.
This will enable RNDIS if necessary and then bring up tethering once usb0 is enabled.

Change-Id: Iae1f733366aa6b0dafa66d4c97207794173ef54b
Signed-off-by: Mike Lockwood <lockwood@android.com>

Mike Lockwood   commited 2011-07-23 21:57:55 -04:00
ed4a1741b4
am 6ef5bd7a: am 9810742c: Add better routes for secondary DNS
* commit '6ef5bd7a00':
  Add better routes for secondary DNS

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-22 13:17:54 -07:00
da15bead3c
Add better routes for secondary DNS
We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on
some devices (multi-homed stingray) this is a problem.  Add gateway-ed hostroutes
instead so the BP can do it's nonstandard "magical" demultiplexing.

bug:5011392
Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb

Robert Greenwalt   commited 2011-07-22 12:52:21 -07:00
9810742cd8
resolved conflicts for merge of d57579a4 to master
Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81

Robert Greenwalt   commited 2011-07-15 10:52:54 -07:00
3079c1666e
Apply the dns and route diff which we get a change
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc

Robert Greenwalt   commited 2011-07-14 18:12:14 -07:00
e8d2a4a8a0
VPN: close the socket in protectVpn() to avoid leaking descriptors.
Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354

Chia-chi Yeh   commited 2011-07-14 16:19:19 -07:00
9e4ff6ef91
am 6b5e201d: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
* commit '6b5e201d47':
  Remove STOPSHIP but allow seamless Handoff when possible.

Wink Saville   authored and   Android Git Automerger   commited 2011-07-14 10:55:58 -07:00
d622c319ae
Remove STOPSHIP but allow seamless Handoff when possible.
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.


Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9

Wink Saville   commited 2011-07-13 13:44:13 -07:00
051a664b14
resolved conflicts for merge of a3b4b5ca to master
Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12

Wink Saville   commited 2011-07-08 12:49:14 -07:00
620e1078ec
Use resetConnections with resetMask.
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694

Wink Saville   commited 2011-07-07 16:17:06 -07:00
c101c56ecc
VPN: implement status report for legacy VPN.
Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6

Chia-chi Yeh   commited 2011-07-04 03:23:12 -07:00
bded3eb138
VPN: convert prepare() into a form which helps solve race conditions.
When someone tries to revoke packageA, it is possible that packageA is
already revoked by packageB. In this case packageB should not be revoked,
and the new prepare() can help solve this problem.

Change-Id: Iee056a191dd99467b8ad1b5379a17b02d404bad1

Chia-chi Yeh   commited 2011-07-03 17:03:27 -07:00
3e2e1da0a0
VPN: export legacy VPN in IConnectivityManager.
Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1

Chia-chi Yeh   commited 2011-07-02 17:15:00 -07:00
7e026b38e9
resolved conflicts for merge of 796539b1 to master
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f

Robert Greenwalt   commited 2011-06-22 13:20:14 -07:00
09d6cdf338
resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e

Irfan Sheriff   commited 2011-06-22 11:01:16 -07:00
9a33301da1
resolved conflicts for merge of 267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04

Irfan Sheriff   commited 2011-06-22 07:11:42 -07:00
a565295565
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
This reverts commit a3663884ca.

Irfan Sheriff   commited 2011-06-21 14:26:37 -07:00
ea8e3c2322
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
This reverts commit 9cfe6197fb.

Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64

Irfan Sheriff   commited 2011-06-21 11:38:23 -07:00
a3663884ca
Fix tethering upstream determination.
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116

Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71

Robert Greenwalt   commited 2011-06-20 11:09:23 -07:00
33cdcdf2fa
Handle removed UIDs in network stats and policy.
When UID_REMOVED, clean up any existing UID network policy so it
doesn't linger for future apps.  Also move any NetworkStatsHistory
to special UID_REMOVED tracking bucket.

Tests for new removal code.  Also test detailed UID stats, including
network changes to verify template matching logic.

Bug: 4584212
Change-Id: I9faadf6b6f3830eb45d86c7f1980a27cdbcdb11e

Jeff Sharkey   commited 2011-06-19 01:08:12 -07:00
d57635406d
VPN: migrate from generic Bundle to our own Parcelable VpnConfig.
Note that VpnConfig is for internal use only.
Also remove hidden methods from ConnectivityManager.

Change-Id: Ic298c4dc9a2c6c452bd8f4be6fa84e7ac489c0c4

Chia-chi Yeh   commited 2011-06-15 17:08:58 -07:00
75cacd5525
The service part of the user space VPN support.
The dialogs will be in another change.

Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc

Chia-chi Yeh   commited 2011-06-08 14:16:42 -07:00
9a4ad7d52c
resolved conflicts for merge of 510d0a75 to master
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86

Robert Greenwalt   commited 2011-06-08 10:01:06 -07:00
269d732e13
Map network identity using ConnectivityService.
Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService.  Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates.  Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91

Jeff Sharkey   commited 2011-06-07 23:09:25 -07:00
21062e7c7e
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749

Robert Greenwalt   commited 2011-06-07 12:45:41 -07:00
f17deff97b
Policy and rules work for ConnectivityManager.
Teach ConnectivityManager about UID-specific rules derived from policy,
such as rejecting network traffic on "paid" interfaces.  Calls that
return NetworkInfo now filter based on any REJECT rules in effect for
the calling UID.  (Added uid parameter if callers that still want all
interfaces.)

Changed NetworkPolicyManager to derive rules based on current policy
combined with PowerManager and ActivityManager status, which it passes
to ConnectivityService for eventual enforcement through netd.  When
rules change the usability of a NetworkInfo for a specific UID, it also
dispatches CONNECTIVITY_ACTION broadcasts to that UID.  Combined paid
and background policy together to match current working definition.

Change-Id: I797ea49439fcc487cfe2cbc16703d4b91ceb9af6

Jeff Sharkey   commited 2011-06-01 17:00:42 -07:00
921ebf2ee5
Reveal some network constants.
Since we've already decided to inc the sdk version we should try to get these in too.

bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775

Robert Greenwalt   commited 2011-05-31 12:06:08 -07:00
6a9d45449d
am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE
* commit '2a4ebb810d':
  Reset connection while data state changed.

Wink Saville   authored and   Android Git Automerger   commited 2011-05-19 11:32:27 -07:00
1dc369c378
Merge "Reset connection while data state changed." into honeycomb-LTE
Wink Saville   authored and   Android (Google) Code Review   commited 2011-05-19 11:25:45 -07:00
049694bfa2
Merge f024027b
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b

Jean-Baptiste Queru   commited 2011-05-19 07:54:53 -07:00
65727c9c5d
Reset connection while data state changed.
Check data call states and reset connection if any link properties changed.


Change-Id: I008aea969378648192852161959fdf4aad6211a1

Wink Saville   commited 2011-05-18 15:59:04 -07:00
f23fb20d13
Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01

Robert Greenwalt   commited 2011-05-18 15:25:43 -07:00
355205c0cd
DO NOT MERGE Add DhcpStateMachine
Add DhcpStateMachine for interation with dhcpcd

- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
    to DHCP request/renewal being sent

Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98

Irfan Sheriff   commited 2011-05-12 14:10:11 -07:00
9cfe6197fb
am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
* commit 'f4c231c4dc':
  Fix initialization of RouteInfo

Wink Saville   authored and   Android Git Automerger   commited 2011-05-12 14:08:05 -07:00
a8f3f7c298
Fix initialization of RouteInfo
IPv6 gateway is not correctly set in RouteInfo

Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c

Kazuhiro Ondo   authored and   Wink Saville   commited 2011-05-11 16:02:00 -07:00
efa66d9fe9
am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
* commit 'f490d72195':
  Fix the adding of host routes.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-11 13:07:38 -07:00
b5c62b6230
Fix the adding of host routes.
We used to just add

Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a

Robert Greenwalt   commited 2011-05-10 11:27:46 -07:00
bd49221570
am df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit 'df6da5c96b':
  Add auto-restore timeout for secondary networks.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-04 12:47:30 -07:00
e7dcc1362f
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-05-04 09:59:30 -07:00
aae781f32b
Add auto-restore timeout for secondary networks.
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.

Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23

Robert Greenwalt   commited 2011-05-03 19:10:26 -07:00
20f819c64b
resolved conflicts for merge of 90faa5de to master
Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6

Robert Greenwalt   commited 2011-05-02 14:41:57 -07:00
b0d1452d58
am 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
* commit '78204ba57c':
  Add DhcpStateMachine for interation with dhcpcd

Irfan Sheriff   authored and   Android Git Automerger   commited 2011-05-02 13:29:36 -07:00
52b5163b83
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-05-02 13:26:52 -07:00
5afb46660c
Add RouteInfo objects for tracking routes.
Used to have list of gateways for default routes, but general static routes
should be supported.

Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6

Robert Greenwalt   commited 2011-05-02 11:17:30 -07:00
5a901298ed
Add DhcpStateMachine for interation with dhcpcd
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
  simultaneously
- Optionally, a controller can request a notification prior
  to DHCP request/renewal being sent

Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93

Irfan Sheriff   commited 2011-04-30 12:58:51 -07:00
204cec7dd5
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
* commit '8177aee2dc':
  Make new networkAttribute parameter non-optional.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-04-26 01:35:39 -07:00
ef903acab4
Make new networkAttribute parameter non-optional.
Dependencymet sets the default dep-met value for the network.  Should
be set to true unless you know what you're doing.

Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129

Robert Greenwalt   commited 2011-04-25 16:04:45 -07:00
2240524be9
Expose more net types to the public.
Ethernet and bluetooth.

Change-Id: Ic499709ffa151c0f27aef497373a8de7289e3e7f

Robert Greenwalt   commited 2011-04-22 18:09:03 -07:00
f76c55d289