Robert Greenwalt
f95bfb1fa5
am a07f1f2d: Remove STOPSHIP and defer removal.
...
* commit 'a07f1f2d07832eaebe011f018cfbc643cf4a0dbd':
Remove STOPSHIP and defer removal.
2013-04-19 10:17:41 -07:00
Robert Greenwalt
a07f1f2d07
Remove STOPSHIP and defer removal.
...
bug:8657300
Change-Id: Ia855fdc0db7a33502838648ee002d4929b224960
2013-04-19 09:31:24 -07:00
The Android Open Source Project
7174487090
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
2013-04-15 10:46:07 -07:00
The Android Automerger
382a281e32
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-15 05:55:51 -07:00
Robert Greenwalt
46976c9027
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
24bc534c2e
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
44bdc908ca
am 10572edb: Merge "Routing workaround." into jb-mr2-dev
...
* commit '10572edbbaa5176518bf8831913b3839e5f95b7f':
Routing workaround.
2013-04-11 16:29:38 -07:00
Robert Greenwalt
10572edbba
Merge "Routing workaround." into jb-mr2-dev
2013-04-11 23:27:20 +00:00
Robert Greenwalt
c5976600f8
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
aa4677cfa0
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
c680df2b0b
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I3f174e8a8e79b7f7ab1ced7ba665c538183948f2
2013-04-10 10:05:34 -07:00
The Android Automerger
5ff0d2c0b2
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-10 05:56:05 -07:00
Robert Greenwalt
921bf3867d
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
215018f6e2
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
da77cb16c8
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
ebff3ebaba
Reconcile with jb-mr2-release - do not merge
...
Change-Id: If51129696a3a4c3495ef07f2e74f854a9409013d
2013-04-03 16:43:20 -07:00
The Android Automerger
0b2a7ca5ca
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-03 06:02:30 -07:00
Lorenzo Colitti
79f58996c5
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
02af5ba496
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I58918ca2ce096a604a97119d0c0bd232ef064a5a
2013-04-02 08:39:31 -07:00
Lorenzo Colitti
c3787faa2a
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
ee22653b75
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
9b48b90c6f
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I82cfbeb6b54a3bb1225321fb5bb9d57b6ce1d821
2013-03-29 09:48:56 -07:00
Lorenzo Colitti
76fcb627ae
am d40130ab: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev
...
* commit 'd40130abbe1cf88665a98ac2d0ec1c30bd089308':
Stop clat if it's no longer in use.
2013-03-28 18:22:04 -07:00
Lorenzo Colitti
d40130abbe
Merge "Stop clat if it's no longer in use." into jb-mr2-dev
2013-03-29 01:17:45 +00:00
Robert Greenwalt
baee17e854
am 2e3f7f04: Merge "Add BT - DataTracker connection" into jb-mr2-dev
...
* commit '2e3f7f04fc73a28474540f359a0991de2cd9abce':
Add BT - DataTracker connection
2013-03-28 09:49:27 -07:00
Robert Greenwalt
2e3f7f04fc
Merge "Add BT - DataTracker connection" into jb-mr2-dev
2013-03-28 16:45:33 +00:00
Wink Saville
157e5bf119
am f98a515f: Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
...
* commit 'f98a515fd1671e1982e9333ab481d0c755470b63':
Cleanup some debug in LinkCapabilities and Properties.
2013-03-28 09:14:12 -07:00
Wink Saville
f98a515fd1
Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-dev
2013-03-28 16:09:26 +00:00
The Android Automerger
0815173f4b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-28 05:55:45 -07:00
Lorenzo Colitti
7e5624bb80
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
2accd693ee
Cleanup some debug in LinkCapabilities and Properties.
...
Change-Id: I5fe0124d0943f5e538e451645f32533a74c75a47
2013-03-27 16:21:43 -07:00
Robert Greenwalt
030e1d3e9b
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
faac152a2d
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
cdc56fea29
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
a4712d353f
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I499f557f51897fdc8fa9c1cab67ee1af4b91ce9d
2013-03-26 10:49:24 -07:00
The Android Automerger
a6e826832f
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:56:01 -07:00
Robert Greenwalt
f92734e168
am e1b73b79: Prevent NPE in new API.
...
* commit 'e1b73b7953d5ef42c2f6bc979e207e1566245d11':
Prevent NPE in new API.
2013-03-22 19:07:01 +00:00
Robert Greenwalt
e1b73b7953
Prevent NPE in new API.
...
bug:8455284
Change-Id: I26ecbd024d1fe001f3af792c4e66409b2968c7ec
2013-03-22 12:00:17 -07:00
Lorenzo Colitti
97f2e96382
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
a546d7ef93
Reset connections on all stacked interfaces.
...
Bug: 8276725
Change-Id: I7fe99c6ea123037cef3e89e3c2c17ed43cc0b1ea
2013-03-20 19:22:58 +09:00
The Android Automerger
095035b66a
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-19 05:55:27 -07:00
Lorenzo Colitti
82217ba580
Merge "Framework changes for 464xlat." into jb-mr2-dev
2013-03-18 16:41:58 +00:00
The Android Automerger
7a6fb8e57a
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-18 05:55:55 -07:00
Robert Greenwalt
fa4e867061
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
c4f5482874
Don't update routes if Dhcp fails.
...
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
2013-03-15 12:55:24 -07:00
Robert Greenwalt
26ce4b57d5
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
2d17281ca7
Merge "Don't update routes if Dhcp fails." into jb-mr2-dev
2013-03-15 18:06:20 +00:00
Robert Greenwalt
69d28dc2b3
Don't update routes if Dhcp fails.
...
bug:8377625
Change-Id: I11d2c29728078813bfb1245cc46e8cce2b307a2c
2013-03-15 10:48:46 -07:00
Lorenzo Colitti
50e2b43ce1
Fix build.
...
Change-Id: Iac84a5f35d7fcaebd096e605a4590f8c90fe97b0
2013-03-16 02:42:30 +09:00
Lorenzo Colitti
8c9e75757f
Merge "Set routes from stacked links as well." into jb-mr2-dev
2013-03-15 17:14:43 +00:00