Robert Greenwalt
084e4774f2
DO NOT MERGE - backport of l92a02b31 from master
...
Fix handling of multiple possible default networks.
bug:3328196
Change-Id: I994f1621ff82de454192945a9cae961e1710d537
2011-02-11 17:32:58 -08:00
Robert Greenwalt
5c733977a4
Update LinkProperties treatment of gateways
...
A link can have multiple gateways (think ipv4/ipv6 for a trivial example).
.
bug:3438810
Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8
2011-02-11 11:06:23 -08:00
The Android Automerger
fd34a5c57d
merge in honeycomb-release history after reset to honeycomb
2011-02-04 22:26:00 -08:00
The Android Automerger
8248739ef0
merge in honeycomb-release history after reset to honeycomb
2011-02-04 10:26:10 -08:00
The Android Automerger
32690442d1
merge in gingerbread-release history after reset to gingerbread
2011-01-30 16:03:22 -08:00
The Android Automerger
64a1819dd1
merge in honeycomb-release history after reset to honeycomb
2011-01-30 13:37:53 -08:00
The Android Open Source Project
20bbfe73dd
am 44d258d5: Reconcile gingerbread-plus-aosp and honeycomb
...
* commit '44d258d5be10ff68e0eae700b6439ec4b94f5a31':
resolved conflicts for merge of a314f32b to honeycomb-merge
2011-01-30 12:54:18 -08:00
The Android Open Source Project
44d258d5be
Reconcile gingerbread-plus-aosp and honeycomb
...
Change-Id: I7ca5acfee971105e3f3d6a674f82da0e890b0434
2011-01-30 12:40:39 -08:00
The Android Open Source Project
abcb4fecfc
Mass merge from gingerbread - do not merge
...
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Jean-Baptiste Queru
d97edba7d1
Merge 6b739dc7 from gingerbread
...
Change-Id: If94889da67977aff7daa1e201c10cd51b7e2fff8
2011-01-29 12:59:20 -08:00
Robert Greenwalt
f2b39b4773
am 996d60e3: resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp
...
* commit '996d60e3a5abe29479b741bd1b346977e4c101aa':
Add some network types that OEM's are asking for.
2011-01-29 09:35:28 -08:00
Robert Greenwalt
996d60e3a5
resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp
...
Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963
2011-01-29 09:32:04 -08:00
Robert Greenwalt
36165a676a
am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread
...
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
Add some network types that OEM's are asking for.
2011-01-29 06:55:38 -08:00
Robert Greenwalt
9d07781cb6
Add some network types that OEM's are asking for.
...
Adding them hidden so that if OEM's are rolling their own at least they can
use the same values. Will mark them unhidden in a future sdk release.
bug:3395729
Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c
2011-01-28 14:48:37 -08:00
Robert Greenwalt
52ef39aff1
Fix the build
...
Check for null before trying to make InetAddresses.
Change-Id: I3228eea32eb455437dd76be2de56a913884f3f6e
2011-01-27 10:49:27 -08:00
The Android Automerger
9369876a09
merge in honeycomb-release history after reset to honeycomb
2011-01-27 07:26:17 -08:00
Wink Saville
2ec53df18d
am 93fbb0ad: am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb
...
* commit '93fbb0ad960a658633dfa2bc7be9584e4361ab85':
Comment out the isAvailable optimization.
2011-01-26 19:09:22 -08:00
Wink Saville
b52dbfe01a
Comment out the isAvailable optimization.
...
As the comment says this causes problems if the connection
is handling errors. This removes the optimization for now.
Bug: 3386481
Change-Id: I6cb00abe8b1949e9b79b4906a6bdab5872b5054d
2011-01-26 18:29:51 -08:00
Wink Saville
72a95b97e9
Comment out the isAvailable optimization.
...
As the comment says this causes problems if the connection
is handling errors. This removes the optimization for now.
Bug: 3386481
Change-Id: I6cb00abe8b1949e9b79b4906a6bdab5872b5054d
2011-01-26 15:43:49 -08:00
Robert Greenwalt
3ec1eeea3a
Get rid of manual int->ipv4 string generation
...
bug:2542681
Change-Id: I67919d7b5dc8d72eeb2dfb9e3906210b1951d4fb
2011-01-26 13:57:24 -08:00
Robert Greenwalt
7baf8a8f08
Make the interface with DHCP IPv6 capable.
...
It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework.
bug:2542681
Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56
2011-01-26 09:10:01 -08:00
Robert Greenwalt
9f83abb01a
Merge "Switch from NetworkUtils to netd for iface config."
2011-01-21 12:06:16 -08:00
Robert Greenwalt
2e1763cb15
Switch from NetworkUtils to netd for iface config.
...
Moving more stuff to netd and getting rid of unused NetworkUtils.
Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7
2011-01-21 10:44:12 -08:00
The Android Automerger
41333f8e8c
merge in honeycomb-release history after reset to honeycomb
2011-01-20 07:41:25 -08:00
Hung-ying Tyan
4116cd5901
am 9e0357b9: am 71196f0c: Merge "Make VpnService synchronous API." into honeycomb
...
* commit '9e0357b96bd5c84e39c3084625d58b21f9bad74c':
Make VpnService synchronous API.
2011-01-19 22:46:32 -08:00
Hung-ying Tyan
4e723420e0
Make VpnService synchronous API.
...
This eases VpnSettings on dealing with multiple-activity-instance problem
(i.e., SettingsActivity and VpnSettingsActivity).
+ Most of the code is moved from the VpnServices package to vpn/java/.
+ VpnManager and VpnServiceBinder are revised to provide synchronous API.
+ Add a new method isIdle() to IVpnService.aidl.
Related bug: 3293236 (need to deal with multiple-activity-instance problem)
Change-Id: I03afa3b3af85d7b4ef800683cd075c356a9266c4
2011-01-20 12:51:43 +08:00
The Android Automerger
b1d1b2c8e6
merge in gingerbread-release history after reset to gingerbread
2011-01-16 16:22:06 -08:00
The Android Automerger
8bd51789b4
merge in honeycomb-release history after reset to honeycomb
2011-01-14 07:22:45 -08:00
Robert Greenwalt
b3708c3de8
am 4b43f944: am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
...
* commit '4b43f94499b6d0c4a34961d48b97d5e48a039f65':
Turn off DUN connection after tethering.
2011-01-13 10:25:25 -08:00
The Android Automerger
e809369b62
merge in honeycomb-release history after reset to honeycomb
2011-01-13 07:21:59 -08:00
Robert Greenwalt
9f3be4c403
Turn off DUN connection after tethering.
...
Use matching feature type when turning tethering off or the request is ignored.
Also, turn on DUN apn right away so that we don't fail aggressive test cases.
Also don't report connections for enabled apn's that we're no longer connected to.
bug:3332880
bug:3338033
Change-Id: I7db2dfd4879f03465bc9f6d39488c078570dcaf3
2011-01-12 15:52:10 -08:00
Robert Greenwalt
e3e5f46511
am 1ea7e5df: am a78e9f05: Merge "Fix any_connection reporting." into honeycomb
...
* commit '1ea7e5df91f023d03fa7c87c534e6024795abaaa':
Fix any_connection reporting.
2011-01-12 07:21:32 -08:00
Robert Greenwalt
4b7c55e4ee
Fix any_connection reporting.
...
A recent change caused us to think there was no other connection available
when transitioning from 3g to wifi.
bug:3335074
Change-Id: I1f55df8a0eb5b27131572b111fbaac8f1ebbc0d3
2011-01-11 18:32:17 -08:00
android-merger
8270623f37
merge (-s ours) history of HRI06B
2011-01-07 15:38:12 -08:00
Robert Greenwalt
4397fdfa34
Fix handling of multiple possible default networks
...
Old code assumed only 2 choices but now we have more.
bug:3328196
Change-Id: I92a02b31fae6c53f73b3684581230fad5cb1b82a
2011-01-07 11:42:20 -08:00
The Android Automerger
bb89d7cbf5
merge in honeycomb-release history after reset to honeycomb
2011-01-07 07:46:11 -08:00
Robert Greenwalt
4c6d10445f
am 89c8f755: Merge "Fix handling of multiple possible default networks" into honeycomb
...
* commit '89c8f7554bbec5d62ebeddddc2ef2460265a80c5':
Fix handling of multiple possible default networks
2011-01-07 00:28:55 -08:00
Jesse Wilson
3741bedee7
Deprecate a method that formats only IPv4 addresses.
...
Anyone calling this method is probably storing IP addresses
in an int, which doesn't make sense anymore.
Change-Id: Iba535b66f6cff47ce07b5ecc6427e3b2fd846998
2011-01-06 19:33:00 -08:00
Robert Greenwalt
9256485b0b
Fix handling of multiple possible default networks
...
Old code assumed only 2 choices but now we have more.
bug:3328196
Change-Id: I92a02b31fae6c53f73b3684581230fad5cb1b82a
2011-01-06 17:12:23 -08:00
Stan Chesnutt
1f2a2ace5d
connectivity-change events can happen before boot completes (similar to:
...
https://android-git.corp.google.com/g/#change,87425 )
Change-Id: Ibc0f12defaa5d90894657ce63fb352578eca7060
2011-01-06 11:00:19 -08:00
The Android Automerger
c924036a9e
merge in honeycomb-release history after reset to honeycomb
2011-01-06 07:30:36 -08:00
Stan Chesnutt
f444f50b79
Allow bumpDns() to execute correctly before boot has completed
...
Change-Id: I5c2cf023e555f49d7e29592f9d1439b3ac367e3d
2011-01-05 17:14:03 -08:00
The Android Automerger
b0a162e68e
merge in honeycomb-release history after reset to master
2011-01-05 07:26:31 -08:00
Robert Greenwalt
2cc8744a3d
Always file DUN requests for tethering.
...
A bit of a hack so that first trySetupData call uses the proper APN in
strange edge cases. Made a new startUsingNetworkFeature string
that ConnectivityService knows means always pass the request to telephony
even if telephony connections are not currently available.
bug:3133178
Change-Id: I2559b9cbaed4b4ec02bdf7ea78e6003ee2be64f2
2011-01-04 11:15:19 -08:00
The Android Automerger
88bcabee38
merge in honeycomb-release history after reset to master
2011-01-04 07:31:40 -08:00
Robert Greenwalt
d62c7000a1
Cache the current value of background-data.
...
The writing of the persistent setting is async, but we should
still remember it so if somebody asks before the write completes
we give the right answer. Makes the read faster too.
bug:3312848
Change-Id: I864cb5f8d496d5bf9cbf0af9a71ca84da078f7c6
2010-12-29 16:15:02 -08:00
Robert Greenwalt
611291c8ef
Make sure the ProxyProperties is always present.
...
Lets people know that it's non-null, though the InetAddr inside may be.
bug:3305689
Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91
2010-12-28 11:15:06 -08:00
Robert Greenwalt
8ca8876c68
Reduce the spinning while tethering.
...
Doing too much stuff - don't retry when we know we shouldn't.
bug:3293460
Change-Id: Ic7b0b6486b39377d74df7a35572059ac60d03fa0
2010-12-23 17:13:57 -08:00
Benoit Goby
fb2cdd7fe4
Add USB Ethernet support
...
Change-Id: Idb333f15818f455eedfb62f81358499dc7419f5b
2010-12-23 16:35:52 -08:00
Jaikumar Ganesh
0db51a0631
Add TYPE_BLUETOOTH network interface for reverse tethering.
...
Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998
2010-12-22 15:24:18 -08:00