Robert Greenwalt
00ca322d5d
am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE
...
* commit '5f3505121b761dbd3bba62d1603fbab49de139b9':
Reset connections AFTER we take down the network.
2011-06-16 12:42:15 -07:00
Robert Greenwalt
36ea869426
Reset connections AFTER we take down the network.
...
If you do it before you have a race condition and some apps will
manage to reconnect on the dieing network before it goes and then
get no notification when it goes.
bug: 3408025
Change-Id: I5386ff313c759b3f687bc38731454ab43dbe76b8
2011-06-16 11:26:54 -07:00
Robert Greenwalt
510d0a756a
am f17deff9: resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
* commit 'f17deff97b290382b9e111e35fc2189ac8ffb75c':
Reveal some network constants.
2011-06-07 13:12:29 -07:00
Robert Greenwalt
f17deff97b
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
...
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
2011-06-07 12:45:41 -07:00
Robert Greenwalt
6a9d45449d
Reveal some network constants.
...
Since we've already decided to inc the sdk version we should try to get these in too.
bug:4500218
Change-Id: I6dcb401bf30f1b06f02be0a93681a190d7ee5775
2011-05-31 12:06:08 -07:00
Robert Greenwalt
e0f7bc0b84
resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
...
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
2011-05-20 15:45:55 -07:00
Robert Greenwalt
e1544bb9ea
Simplfy getActive* calls in ConnectivityService
...
One had been simplified on GB, but somehow it didn't make it here.
bug: 4463770
Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b
2011-05-20 12:23:41 -07:00
Wink Saville
2a4ebb810d
am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit '049694bfa249c9238d24e0f635b763a53c179ca2':
Reset connection while data state changed.
2011-05-19 11:28:36 -07:00
Wink Saville
049694bfa2
Merge "Reset connection while data state changed." into honeycomb-LTE
2011-05-19 11:25:45 -07:00
Robert Greenwalt
f024027b55
am 355205c0: Switch to use netd to add/remove routes.
...
* commit '355205c0cd712fb964cd47ec7f65616808d5ef75':
Switch to use netd to add/remove routes.
2011-05-18 16:33:16 -07:00
Wink Saville
f23fb20d13
Reset connection while data state changed.
...
Check data call states and reset connection if any link properties changed.
Change-Id: I008aea969378648192852161959fdf4aad6211a1
2011-05-18 15:59:04 -07:00
Robert Greenwalt
355205c0cd
Switch to use netd to add/remove routes.
...
Also adds support for v6 routes and for removing single routes.
Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
2011-05-18 15:25:43 -07:00
Kazuhiro Ondo
a9f139c4f0
am 3a34041f: Linkproperties update via unsol data call state change.
...
* commit '3a34041f8027bf15cb2653c1a46146b605dbb702':
Linkproperties update via unsol data call state change.
2011-05-18 00:02:31 -07:00
Kazuhiro Ondo
3a34041f80
Linkproperties update via unsol data call state change.
...
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.
Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
2011-05-17 20:53:40 -07:00
Irfan Sheriff
ea7aa92a95
am 891bdee2: Merge commit \'01ea7f01\' into manualmerge1
...
* commit '891bdee2baf3fc7189110c24a1d1b9080e8d1d48':
DO NOT MERGE Add DhcpStateMachine
2011-05-12 17:37:06 -07:00
Irfan Sheriff
891bdee2ba
Merge commit '01ea7f01' into manualmerge1
2011-05-12 17:19:56 -07:00
Irfan Sheriff
9cfe6197fb
DO NOT MERGE Add DhcpStateMachine
...
Add DhcpStateMachine for interation with dhcpcd
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent
Change-Id: I5324814b19ff19863aa6fa89f1e3f0a202930c98
2011-05-12 14:10:11 -07:00
Wink Saville
f4c231c4dc
am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE
...
* commit '76a118dd9e1bc8be33e1e22b7264b7f918f6f050':
Fix initialization of RouteInfo
2011-05-12 14:03:31 -07:00
Kazuhiro Ondo
efa66d9fe9
Fix initialization of RouteInfo
...
IPv6 gateway is not correctly set in RouteInfo
Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c
2011-05-11 16:02:00 -07:00
Robert Greenwalt
f490d72195
am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE
...
* commit 'e6848faceff58f84f671dbc73be08ef7890fea09':
Fix the adding of host routes.
2011-05-10 11:53:57 -07:00
Robert Greenwalt
bd49221570
Fix the adding of host routes.
...
We used to just add
Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a
2011-05-10 11:27:46 -07:00
Robert Greenwalt
df6da5c96b
am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
...
* commit 'aae781f32bc769f6275d3cfc200cbbadf3f820f6':
Add auto-restore timeout for secondary networks.
2011-05-04 10:02:16 -07:00
Robert Greenwalt
aae781f32b
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
2011-05-04 09:59:30 -07:00
Robert Greenwalt
20f819c64b
Add auto-restore timeout for secondary networks.
...
Settable per network so you can have not timeout for some and some for others.
If you set the old NETWORK_RESTORE_DELAY_PROP_NAME system property
(android.telephony.apn-restore) it will override this value.
Change-Id: Icca706fdc74245dce679209116660e5dc4b05d23
2011-05-03 19:10:26 -07:00
Robert Greenwalt
90faa5de18
am 5afb4666: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
...
* commit '5afb46660c3f6e622302bbd77c25f9e1275f2c2f':
Add RouteInfo objects for tracking routes.
2011-05-02 13:29:22 -07:00
Robert Greenwalt
5afb46660c
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE
2011-05-02 13:26:52 -07:00
Irfan Sheriff
78204ba57c
am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE
...
* commit '8ab6a6d415156bb543a735612fbbdecfbff6c3a4':
Add DhcpStateMachine for interation with dhcpcd
2011-05-02 12:26:52 -07:00
Robert Greenwalt
5a901298ed
Add RouteInfo objects for tracking routes.
...
Used to have list of gateways for default routes, but general static routes
should be supported.
Change-Id: I01730142c6139f2b833b9d48f5381d2d320b69f6
2011-05-02 11:17:30 -07:00
Irfan Sheriff
204cec7dd5
Add DhcpStateMachine for interation with dhcpcd
...
- Supports wakeup and renewal on dhcp
- Supports multiple controllers to use the state machine
simultaneously
- Optionally, a controller can request a notification prior
to DHCP request/renewal being sent
Change-Id: I3a9d7e6a02ff26be3a86ddca6964683ad3c28f93
2011-04-30 12:58:51 -07:00
Robert Greenwalt
8177aee2dc
am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
...
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
Make new networkAttribute parameter non-optional.
2011-04-26 00:23:03 -07:00
Robert Greenwalt
2240524be9
Make new networkAttribute parameter non-optional.
...
Dependencymet sets the default dep-met value for the network. Should
be set to true unless you know what you're doing.
Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
2011-04-25 16:04:45 -07:00
Benoit Goby
d27954e05a
am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
...
* commit 'c40de32ef747fc206d3ec2980b8f7a7aff0f1967':
Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
c40de32ef7
resolved conflicts for merge of 6cec7f35 to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Benoit Goby
6cec7f3535
Add support for USB Ethernet adapters
...
Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d
2011-04-11 16:33:43 -07:00
Wink Saville
75b5e9967f
am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
...
* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
ConnectivityService needs to use the new names for the NetConfig vars.
2011-04-07 14:29:17 -07:00
Wink Saville
f2a6283da9
ConnectivityService needs to use the new names for the NetConfig vars.
...
Change-Id: I809a624057462871cd1849051286c2bffd5099e9
2011-04-07 14:23:45 -07:00
Robert Greenwalt
1a087f0f01
resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp
...
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
2011-04-07 14:13:52 -07:00
Robert Greenwalt
2879f7352b
Merge "Add external dependency API." into honeycomb-LTE
2011-04-07 13:02:28 -07:00
John Wang
f2cc9d1c7a
am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE
...
* commit '5d6f1167039e22889545212ce18192460f9b503e':
Make LinkProperties comparable.
2011-04-07 12:46:18 -07:00
John Wang
3e567d5c3a
Make LinkProperties comparable.
...
Add equals() and hashcode() to LinkProperties and related fields.
Bug:3501569
Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e
2011-04-07 12:36:56 -07:00
Robert Greenwalt
34848c0192
Add external dependency API.
...
An APN will not be connected to if some external dependency is not met.
bug:3486704
Change-Id: I7d94df343b260013efd11faa978deb13f07f1389
2011-04-07 12:28:37 -07:00
Simon Wilson
2e4b442d54
am 02497176: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit '0249717644b0f4f1f3f0316e2de2930a16b019bc':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 17:44:38 -07:00
Robert Greenwalt
1851011379
resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp
...
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
2011-04-04 16:26:42 -07:00
Simon Wilson
0249717644
am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
...
* commit 'ec94472835787b66e1799110411d5077d0ef37cd':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
2011-04-04 12:25:25 -07:00
Robert Greenwalt
e00e35a54c
am 9991017b: Only leave one default network up at a time.
...
* commit '9991017bbd026080695fc33198609be7bfd4f9be':
Only leave one default network up at a time.
2011-04-04 12:18:58 -07:00
Robert Greenwalt
f7dae30b20
Fix the build.
...
Fix a bad merge.
Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee
2011-03-31 10:44:47 -07:00
Robert Greenwalt
3a378b9f2d
resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp
...
Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1
2011-03-30 15:03:13 -07:00
TK MUN
dc9a535917
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
...
When user uncheck "Data Enabled" check box, WiMAX goes
into "disconnected" state.
Change-Id: I3b9bdbc16cc4ddbf7a1aac0c984cad8994c4e9f2
Signed-off-by: TK MUN <tk.mun@samsung.com >
2011-03-30 13:18:23 -07:00
Robert Greenwalt
b2f5deca7d
am 568845a7: Merge "Fix some alt-network issues." into gingerbread
...
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
Fix some alt-network issues.
2011-03-30 09:30:15 -07:00
Robert Greenwalt
9991017bbd
Only leave one default network up at a time.
...
If original refuses to tear down, tear down new one. It's better
to have none (which will try to launch them all again) than two.
Really people shouldn't refuse the teardown request.
bug:4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
2011-03-29 11:36:28 -07:00