Commit graph

4,287 commits

Message SHA1
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-01 05:55:49 -07:00
6c29774483
Reconcile with jb-mr2-release - do not merge
Change-Id: I82cfbeb6b54a3bb1225321fb5bb9d57b6ce1d821

The Android Open Source Project   commited 2013-03-29 09:48:56 -07:00
cfc3ac64d5
am 1c17853c: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
* commit '1c17853c0b':
  Stop clat if it's no longer in use.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-03-28 18:22:04 -07:00
19c1f778c9
Merge "Stop clat if it's no longer in use." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-29 01:17:45 +00:00
1c17853c0b
am a0d2ee6e: Merge "Add BT - DataTracker connection" into jb-mr2-dev
* commit 'a0d2ee6ef5':
  Add BT - DataTracker connection

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-03-28 09:49:27 -07:00
093dd5f2e6
Merge "Add BT - DataTracker connection" into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-03-28 16:45:33 +00:00
a0d2ee6ef5
am 8804bd8b: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
* commit '8804bd8bf5':
  Cleanup some debug in LinkCapabilities and Properties.

Wink Saville   authored and   Android Git Automerger   commited 2013-03-28 09:14:12 -07:00
029de75bca
Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
Wink Saville   authored and   Android (Google) Code Review   commited 2013-03-28 16:09:26 +00:00
8804bd8bf5
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-03-28 05:55:45 -07:00
9b6f4fa7f9
Stop clat if it's no longer in use.
Normally, clatd is stopped when a connection disconnects.
However, if the connection's LinkProperties change, or if the
disconnect somehow gets lost (e.g., because of bug 8486114),
then we need to stop it (and possibly restart it).

Bug: 8276725
Change-Id: Ib8ad0d653ed8d0cd70b7414bcaa8fdaef8ba5fcc

Lorenzo Colitti   commited 2013-03-28 14:45:36 +09:00
4118d082f1
Cleanup some debug in LinkCapabilities and Properties.
Change-Id: I5fe0124d0943f5e538e451645f32533a74c75a47

Wink Saville   commited 2013-03-27 16:21:43 -07:00
22d95f3e82
Add BT - DataTracker connection
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.

bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c

Robert Greenwalt   commited 2013-03-27 15:45:12 -07:00
15a4153880
am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev
* commit 'cdee9727e26721910a44ba67980b39de4b103f7d':
  Make isHostRoute match only host routes

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-03-27 15:04:42 -07:00
7da283b440
Make isHostRoute match only host routes
Currently, isHostRoute returns true iff the gateway address is
the unspecified address (0.0.0.0 or ::). Thus, it will return
true for any route that has no gateway (e.g., a route pointing at
a point-to-point interface), even if the route is not a host
route.

Fix this by checking the prefix length instead. This should be
safe because:

1. mDestination cannot be null, since it's created using new.
2. Host routes created using makeHostRoute (which is what
   ConnectivityService calls) always have the correct prefix
   lengths (/32 or /128) set.

Bug: 8276725
Change-Id: I14285398823fa6c312349128c7cc216cad4a84c9

Lorenzo Colitti   commited 2013-03-27 19:41:06 +09:00
aff5413507
Reconcile with jb-mr2-release - do not merge
Change-Id: I499f557f51897fdc8fa9c1cab67ee1af4b91ce9d

The Android Open Source Project   commited 2013-03-26 10:49:24 -07:00
0e67b3f3a5
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-03-25 05:56:01 -07:00
8deeeca426
am 5371dbf5: Prevent NPE in new API.
* commit '5371dbf5ad':
  Prevent NPE in new API.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-03-22 19:07:01 +00:00
6b869a5852
Prevent NPE in new API.
bug:8455284
Change-Id: I26ecbd024d1fe001f3af792c4e66409b2968c7ec

Robert Greenwalt   commited 2013-03-22 12:00:17 -07:00
5371dbf5ad
am 31453e5a: Merge "Reset connections on all stacked interfaces." into jb-mr2-dev
* commit '31453e5a2b5150a18c41b8bebd85223615ad8849':
  Reset connections on all stacked interfaces.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-03-22 09:48:40 +00:00
395f4066d5
Reset connections on all stacked interfaces.
Bug: 8276725
Change-Id: I7fe99c6ea123037cef3e89e3c2c17ed43cc0b1ea

Lorenzo Colitti   commited 2013-03-20 19:22:58 +09:00
6383982582
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-03-19 05:55:27 -07:00
6a67c3e071
Merge "Framework changes for 464xlat." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-18 16:41:58 +00:00
52a5edce45
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-03-18 05:55:55 -07:00
2e79d0d254
Revert of Ifd0c4081a. Turning off logging.
Found our bug, so switching the logging back off.
bug:8377625

Change-Id: I254bd83c48f1dd8dd62db1fcb162d460328169c5

Robert Greenwalt   commited 2013-03-15 20:20:11 +00:00
fe86530b37
Don't update routes if Dhcp fails.
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c

Robert Greenwalt   authored and   The Android Automerger   commited 2013-03-15 12:55:24 -07:00
79555229c8
Don't return an unmod collection.
It's not needed as people can mess with this, and people do, so this fixes the build.
bug:8398355

Change-Id: Iddd00af41009c88b67fb7f9a8789bb416c377922

Robert Greenwalt   commited 2013-03-15 11:28:50 -07:00
f338508972
Merge "Don't update routes if Dhcp fails." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-15 18:06:20 +00:00
cee3e458d2
Don't update routes if Dhcp fails.
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c

Robert Greenwalt   commited 2013-03-15 10:48:46 -07:00
0c0db62a64
Fix build.
Change-Id: Iac84a5f35d7fcaebd096e605a4590f8c90fe97b0

Lorenzo Colitti   commited 2013-03-16 02:42:30 +09:00
3989de8e16
Merge "Set routes from stacked links as well." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-15 17:14:43 +00:00
a37623584e
Merge "Add stacked interfaces to LinkProperties." into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-15 17:09:00 +00:00
ba01646777
Framework changes for 464xlat.
1. Add a Nat464Xlat service that ConnectivityService can use
   to start and stop clat. When clat is started, the service
   waits for the clat interface to come up and then calls
   ConnectivityService to add the appropriate routes.
2. Make ConnectivityService start clat when an IPv6-only mobile
   interface is connected. We only support clat on mobile for
   now.
3. Make tethering use the interface that has the IPv4 default
   route insted of using the base interface of the
   LinkProperties. This allows us to tether to a stacked
   interface, which is needed for tethering with 464xlat.

Bug: 8276725
Change-Id: I24480af69ee280f504399062638af0836a56268e

Lorenzo Colitti   commited 2013-03-15 14:41:55 +09:00
7a9d797771
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

Lorenzo Colitti   commited 2013-03-15 14:35:38 +09:00
e43b6c4eb3
Add stacked interfaces to LinkProperties.
Bug: 8276725
Change-Id: I2f592d4c690e9af0459ae742ab16107a10d89353

Lorenzo Colitti   commited 2013-03-15 14:35:32 +09:00
c080312552
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

Wink Saville   authored and   Android (Google) Code Review   commited 2013-03-15 05:07:04 +00:00
93c1d17a1a
Fail fast if somebody is adding default routes
bug:2655011
Change-Id: I25da940e024825bc6e1d1ac5fe7b0d951609c1c1

Robert Greenwalt   commited 2013-03-14 13:16:04 -07:00
24efb41874
Add logging to track down bug
bug:8377625
Change-Id: Ifd0c4081a2f1238dbbc39c6904b993e2fb95455a

Robert Greenwalt   commited 2013-03-13 16:38:46 -07:00
92abc7f76f
Merge "Unit test routes with interfaces in LinkProperties" into jb-mr2-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2013-03-12 22:04:52 +00:00
644b93ecd2
Unit test routes with interfaces in LinkProperties
Change-Id: Ie41a56bc9863ee72f4d7a8f72e436fc57e57b1af

Lorenzo Colitti   commited 2013-03-12 15:01:05 -07:00
8ec0b8a5d6
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

Lorenzo Colitti   commited 2013-03-12 07:39:59 +09:00
53de3366aa
Unbreak documentation build.
Change-Id: I1e904b111e23d221dcb5f917201d4c27f0c1c05b

Lorenzo Colitti   commited 2013-03-12 04:30:47 +09:00
fb47594d3b
Always specify an interface for host routes.
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581

Lorenzo Colitti   commited 2013-03-08 16:41:25 -08:00
7a43b0f7cf
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

Lorenzo Colitti   commited 2013-03-08 16:41:25 -08:00
73b9785a15
Revert "Add default route constants to RouteInfo."
This reverts commit e610dd3e58

Change-Id: Ide6d7f3b935da41477b736ef0ef20ec9872563e1

Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-03-07 20:11:18 +00:00
18fb57af46
Add default route constants to RouteInfo.
Bug: 8276725
Change-Id: I9c3ad7393430de9275f5b1c0189a94e5a27975fc

Lorenzo Colitti   commited 2013-03-07 11:08:08 -08:00
e610dd3e58
Allow loopback traffic in lockdown mode.
Bug: 8245184
Change-Id: If993e3d6f5c7ce5970bfe701074c85b9245aa2aa

Jeff Sharkey   commited 2013-02-28 16:57:58 -08:00
db44d2ca9a
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

Robert Greenwalt   commited 2013-02-22 15:36:33 -08:00
0e0ae8a849
Improve ConnectivityManager docs
Also fix some permission problems.
bug:5738328

Change-Id: Ib32c223f425b1fc03b8cce528456bcb50b540fdf

Robert Greenwalt   commited 2013-02-22 10:39:20 -08:00
faa4b403d9
Improve notification UI for lockdown VPN.
Bug: 7064111
Change-Id: I9554f6a426697b4abeb2ddd0827d314920e88ed6

Jeff Sharkey   commited 2013-02-21 09:47:11 -08:00
ee9275b9c4
merge in jb-mr2-release history after reset to master
The Android Automerger   commited 2013-02-20 05:55:44 -08:00
589d0aa3ab