Robert Greenwalt
7360b699ba
am 75267c4e: Remove STOPSHIP and defer removal.
...
* commit '75267c4ee9c5480de5c9538f02c61ad4d9cd5ef0':
Remove STOPSHIP and defer removal.
2013-04-19 10:17:41 -07:00
Robert Greenwalt
75267c4ee9
Remove STOPSHIP and defer removal.
...
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
2013-04-19 09:31:24 -07:00
The Android Open Source Project
8ecc0ad8fa
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
2013-04-15 10:46:07 -07:00
The Android Automerger
3299aa6182
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-15 05:55:51 -07:00
Robert Greenwalt
e6f90c6add
am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-dev
...
* commit '3016244ffb0ee59a191b294839468a81b45a01f1':
Add new route.hasGateway() api
2013-04-12 12:07:14 -07:00
Robert Greenwalt
59070cfd32
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
2013-04-12 11:22:52 -07:00
Robert Greenwalt
f14237c63a
am cb2f7211: Merge "Routing workaround." into jb-mr2-dev
...
* commit 'cb2f721169778315fe30db44336cb40798b698f9':
Routing workaround.
2013-04-11 16:29:38 -07:00
Robert Greenwalt
cb2f721169
Merge "Routing workaround." into jb-mr2-dev
2013-04-11 23:27:20 +00:00
Robert Greenwalt
f7008227fd
am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-dev
...
* commit 'ccbe7e6ff16fe1afc08f0b8601d83481ba5aee3a':
Use CONNECTIVITY_INTERNAL for global proxy
2013-04-11 14:16:28 -07:00
Robert Greenwalt
6477bd0519
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
2013-04-10 15:32:18 -07:00
The Android Open Source Project
9a80dd84c2
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I3f174e8a8e79b7f7ab1ced7ba665c538183948f2
2013-04-10 10:05:34 -07:00
The Android Automerger
72527d6017
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-10 05:56:05 -07:00
Robert Greenwalt
6bd85ba473
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
2013-04-09 11:22:56 -07:00
Robert Greenwalt
0588c1b9af
am dbf500aa: Merge "Turn back on global proxy support." into jb-mr2-dev
...
* commit 'dbf500aaafd0889aa3ac9bf0fb2b2be4e0c3ebbf':
Turn back on global proxy support.
2013-04-09 11:19:34 -07:00
Robert Greenwalt
f9661d357f
Turn back on global proxy support.
...
This reverts 138626.
Bug:8557674
Change-Id: I7b117d313c424d75bdeeea507541a96342f256f0
2013-04-08 16:31:26 -07:00
The Android Open Source Project
418265445d
Reconcile with jb-mr2-release - do not merge
...
Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d
2013-04-03 16:43:20 -07:00
The Android Automerger
67a0649c66
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-03 06:02:30 -07:00
Lorenzo Colitti
03e29cceac
am 6c2e8fb4: Merge "Fix LinkProperties\'s equals() method." into jb-mr2-dev
...
* commit '6c2e8fb4d530c5fb1352e8667449591b39d89c5a':
Fix LinkProperties's equals() method.
2013-04-02 22:32:34 -07:00
The Android Open Source Project
0f298d20af
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I58918ca2ce096a604a97119d0c0bd232ef064a5a
2013-04-02 08:39:31 -07:00
Lorenzo Colitti
89218e5e3f
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
2013-04-02 10:08:59 +09:00
The Android Automerger
6c29774483
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-01 05:55:49 -07:00
The Android Open Source Project
cfc3ac64d5
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I82cfbeb6b54a3bb1225321fb5bb9d57b6ce1d821
2013-03-29 09:48:56 -07:00
Lorenzo Colitti
19c1f778c9
am 1c17853c: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
...
* commit '1c17853c0b45afb12b63a6ce404e1c2a95810733':
Stop clat if it's no longer in use.
2013-03-28 18:22:04 -07:00
Lorenzo Colitti
1c17853c0b
Merge "Stop clat if it's no longer in use." into jb-mr2-dev
2013-03-29 01:17:45 +00:00
Robert Greenwalt
093dd5f2e6
am a0d2ee6e: Merge "Add BT - DataTracker connection" into jb-mr2-dev
...
* commit 'a0d2ee6ef5d2d9a5e119b3d8cecfdc367ed76aa2':
Add BT - DataTracker connection
2013-03-28 09:49:27 -07:00
Robert Greenwalt
a0d2ee6ef5
Merge "Add BT - DataTracker connection" into jb-mr2-dev
2013-03-28 16:45:33 +00:00
Wink Saville
029de75bca
am 8804bd8b: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
...
* commit '8804bd8bf5ef2216db6fce4fdef896dfd867a11e':
Cleanup some debug in LinkCapabilities and Properties.
2013-03-28 09:14:12 -07:00
Wink Saville
8804bd8bf5
Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
2013-03-28 16:09:26 +00:00
The Android Automerger
9b6f4fa7f9
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-28 05:55:45 -07:00
Lorenzo Colitti
4118d082f1
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
2013-03-28 14:45:36 +09:00
Wink Saville
22d95f3e82
Cleanup some debug in LinkCapabilities and Properties.
...
Change-Id: I5fe0124d0943f5e538e451645f32533a74c75a47
2013-03-27 16:21:43 -07:00
Robert Greenwalt
15a4153880
Add BT - DataTracker connection
...
Allows the external BT stack the means to communicate with
ConnectivityService during reverse tethering.
bug:8445208
Change-Id: Ice7dfb0b50c9481d359aed14a51372878185171c
2013-03-27 15:45:12 -07:00
Lorenzo Colitti
7da283b440
am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev
...
* commit 'cdee9727e26721910a44ba67980b39de4b103f7d':
Make isHostRoute match only host routes
2013-03-27 15:04:42 -07:00
Lorenzo Colitti
aff5413507
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
2013-03-27 19:41:06 +09:00
The Android Open Source Project
0e67b3f3a5
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I499f557f51897fdc8fa9c1cab67ee1af4b91ce9d
2013-03-26 10:49:24 -07:00
The Android Automerger
8deeeca426
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:56:01 -07:00
Robert Greenwalt
6b869a5852
am 5371dbf5: Prevent NPE in new API.
...
* commit '5371dbf5ad8d3fcb8000f2295fb64393e64d44b2':
Prevent NPE in new API.
2013-03-22 19:07:01 +00:00
Robert Greenwalt
5371dbf5ad
Prevent NPE in new API.
...
bug:8455284
Change-Id: I26ecbd024d1fe001f3af792c4e66409b2968c7ec
2013-03-22 12:00:17 -07:00
Lorenzo Colitti
395f4066d5
am 31453e5a: Merge "Reset connections on all stacked interfaces." into jb-mr2-dev
...
* commit '31453e5a2b5150a18c41b8bebd85223615ad8849':
Reset connections on all stacked interfaces.
2013-03-22 09:48:40 +00:00
Lorenzo Colitti
6383982582
Reset connections on all stacked interfaces.
...
Bug: 8276725
Change-Id: I7fe99c6ea123037cef3e89e3c2c17ed43cc0b1ea
2013-03-20 19:22:58 +09:00
The Android Automerger
6a67c3e071
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-19 05:55:27 -07:00
Lorenzo Colitti
52a5edce45
Merge "Framework changes for 464xlat." into jb-mr2-dev
2013-03-18 16:41:58 +00:00
The Android Automerger
2e79d0d254
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-18 05:55:55 -07:00
Robert Greenwalt
fe86530b37
Revert of Ifd0c4081a. Turning off logging.
...
Found our bug, so switching the logging back off.
bug:8377625
Change-Id: I254bd83c48f1dd8dd62db1fcb162d460328169c5
2013-03-15 20:20:11 +00:00
Robert Greenwalt
79555229c8
Don't update routes if Dhcp fails.
...
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
2013-03-15 12:55:24 -07:00
Robert Greenwalt
f338508972
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
2013-03-15 11:28:50 -07:00
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