Commit graph

867 commits

Message SHA1
Reconcile with jb-mr2-release - do not merge
Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1

The Android Open Source Project   commited 2013-05-16 05:43:31 -07:00
b2aa01c0dc
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-25 05:55:26 -07:00
4104544a95
am d292caf4: Merge "Support WiFi only device at runtime." into jb-mr2-dev
* commit 'd292caf445':
  Support WiFi only device at runtime.

Wink Saville   authored and   Android Git Automerger   commited 2013-04-24 08:47:45 -07:00
7d72bf5622
Merge "Support WiFi only device at runtime." into jb-mr2-dev
Wink Saville   authored and   Android (Google) Code Review   commited 2013-04-24 15:44:08 +00:00
d292caf445
Support WiFi only device at runtime.
To date WiFi only devices were defined by the list of networkAttributes
in config.xml overriden in on a per-device basis. This change is the
simplest change needed to determine this at runtime and therefore allowing
a single build to support the two different configurations.

Bug: 8562845
Change-Id: I34de5c6accc718b199c13815537de1debfe3dc91

Wink Saville   commited 2013-04-23 14:26:51 -07:00
23ee8db792
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-23 05:55:28 -07:00
e918ff4ed9
am 665c912a: Merge "Listen for network disconnect." into jb-mr2-dev
* commit '665c912a4c':
  Listen for network disconnect.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-23 03:51:08 -07:00
7a8f0658c6
Merge "Listen for network disconnect." into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-04-22 21:33:29 +00:00
665c912a4c
Listen for network disconnect.
VPN used to just watch the interface, but that is insufficient.  There
is no promise that the interface will go down when we're done with it.
Now that wifi stays on in scan-only mode despite user turning it off
it seems that the interface is left up, even in AP mode.

Now listening for ConnectivityService broadcast that the network we were on
has disconnected and tearing down the VPN then or when the interface
goes away.

bug:8550083
Change-Id: Icf414497bc55bead69de04e91f39f90ac2e6578a

Robert Greenwalt   commited 2013-04-22 14:13:51 -07:00
308b9acca1
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-22 05:55:37 -07:00
ee21d8b57b
am a07f1f2d: Remove STOPSHIP and defer removal.
* commit 'a07f1f2d07':
  Remove STOPSHIP and defer removal.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-19 10:17:41 -07:00
f95bfb1fa5
Remove STOPSHIP and defer removal.
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960

Robert Greenwalt   commited 2013-04-19 09:31:24 -07:00
a07f1f2d07
Reconcile with jb-mr2-release - do not merge
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7

The Android Open Source Project   commited 2013-04-15 10:46:07 -07:00
7174487090
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-15 05:55:51 -07:00
382a281e32
am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
  Add new route.hasGateway() api

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-12 12:07:14 -07:00
46976c9027
Add new route.hasGateway() api
Fixes issues brought in by change to isHostRoute.  isHostRoute
was technically correct, but the callers really wanted hasNextHop
behavior.

bug:8597268
Change-Id: I360761ccfa98b2ba34642f717a78fa71ec1bae4f

Robert Greenwalt   commited 2013-04-12 11:22:52 -07:00
24bc534c2e
am 10572edb: Merge "Routing workaround." into jb-mr2-dev
* commit '10572edbba':
  Routing workaround.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-11 16:29:38 -07:00
44bdc908ca
Merge "Routing workaround." into jb-mr2-dev
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2013-04-11 23:27:20 +00:00
10572edbba
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
  Use CONNECTIVITY_INTERNAL for global proxy

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-11 14:16:28 -07:00
c5976600f8
Use CONNECTIVITY_INTERNAL for global proxy
The Global http proxy shouldn't be used by apps, but can be useful in certain
conditions.

bug:8264794
bug:8557674
Change-Id: Ia3cbe542e448d9e74d0492626a13e9fd34ad797a

Robert Greenwalt   commited 2013-04-10 15:32:18 -07:00
aa4677cfa0
Reconcile with jb-mr2-release - do not merge
Change-Id: I3f174e8a8e79b7f7ab1ced7ba665c538183948f2

The Android Open Source Project   commited 2013-04-10 10:05:34 -07:00
c680df2b0b
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-10 05:56:05 -07:00
5ff0d2c0b2
Routing workaround.
Change our order of operations so that secondary route table
adds succeed.  Working to understand the why of this too.
bug:8361314

Change-Id: Ie25061eb38c62eaa5e60aa8a488496de49bdbd9d

Robert Greenwalt   commited 2013-04-09 11:22:56 -07:00
921bf3867d
am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev
* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
  Turn back on global proxy support.

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-04-09 11:19:34 -07:00
215018f6e2
Turn back on global proxy support.
This reverts 138626.

Bug:8557674
Change-Id: I7b117d313c424d75bdeeea507541a96342f256f0

Robert Greenwalt   commited 2013-04-08 16:31:26 -07:00
da77cb16c8
Reconcile with jb-mr2-release - do not merge
Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d

The Android Open Source Project   commited 2013-04-03 16:43:20 -07:00
ebff3ebaba
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-03 06:02:30 -07:00
0b2a7ca5ca
am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev
* commit '6c2e8fb4d530c5fb1352e8667449591b39d89c5a':
  Fix LinkProperties's equals() method.

Lorenzo Colitti   authored and   Android Git Automerger   commited 2013-04-02 22:32:34 -07:00
79f58996c5
Reconcile with jb-mr2-release - do not merge
Change-Id: I58918ca2ce096a604a97119d0c0bd232ef064a5a

The Android Open Source Project   commited 2013-04-02 08:39:31 -07:00
02af5ba496
Fix LinkProperties's equals() method.
LinkProperties's equals() method was broken by the addition of
stacked interfaces. The reason was that equals() was checking
the equality of mStackedInterfaces.keys(), which is just an
enumeration, instead of mStackedInterfaces.keySet(), which
actually contains the keys. The test was failing, but I didn't
notice.

Fix the bug and make the test check the objects more in depth
so it can give more detailed error messages when equals() fails.

Bug: 8276725
Change-Id: Ie990bd75f641c28e63e54d953dcd0f4de13f7c9f

Lorenzo Colitti   commited 2013-04-02 10:08:59 +09:00
c3787faa2a
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-04-01 05:55:49 -07:00
ee22653b75
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
9b48b90c6f
am d40130ab: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
* commit 'd40130abbe':
  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
76fcb627ae
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
d40130abbe
am 2e3f7f04: Merge "Add BT - DataTracker connection" into jb-mr2-dev
* commit '2e3f7f04fc':
  Add BT - DataTracker connection

Robert Greenwalt   authored and   Android Git Automerger   commited 2013-03-28 09:49:27 -07:00
baee17e854
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
2e3f7f04fc
am f98a515f: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
* commit 'f98a515fd1':
  Cleanup some debug in LinkCapabilities and Properties.

Wink Saville   authored and   Android Git Automerger   commited 2013-03-28 09:14:12 -07:00
157e5bf119
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
f98a515fd1
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-03-28 05:55:45 -07:00
0815173f4b
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
7e5624bb80
Cleanup some debug in LinkCapabilities and Properties.
Change-Id: I5fe0124d0943f5e538e451645f32533a74c75a47

Wink Saville   commited 2013-03-27 16:21:43 -07:00
2accd693ee
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
030e1d3e9b
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
faac152a2d
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
cdc56fea29
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
a4712d353f
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger   commited 2013-03-25 05:56:01 -07:00
a6e826832f
am e1b73b79: Prevent NPE in new API.
* commit 'e1b73b7953':
  Prevent NPE in new API.

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

Robert Greenwalt   commited 2013-03-22 12:00:17 -07:00
e1b73b7953
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
97f2e96382
Reset connections on all stacked interfaces.
Bug: 8276725
Change-Id: I7fe99c6ea123037cef3e89e3c2c17ed43cc0b1ea

Lorenzo Colitti   commited 2013-03-20 19:22:58 +09:00
a546d7ef93