Robert Greenwalt
d57579a4a4
resolved conflicts for merge of e8d2a4a8 to honeycomb-plus-aosp
...
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
2011-07-15 09:55:48 -07:00
Robert Greenwalt
e8d2a4a8a0
Apply the dns and route diff which we get a change
...
bug:5008973
Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc
2011-07-14 18:12:14 -07:00
Wink Saville
6b5e201d47
am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE
...
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
Remove STOPSHIP but allow seamless Handoff when possible.
2011-07-13 14:19:12 -07:00
Wink Saville
051a664b14
Remove STOPSHIP but allow seamless Handoff when possible.
...
If an address is removed we must reset the connection but
only for the connections associated with that address. For
now we're doing the "all" addresses for a type (IPv6 or IPv4)
in the future we only need to reset a particular addresses
connections.
Bug: 4981919
Change-Id: I97f8071a3ed6f827ed22f32216ca5011bfe6c1d9
2011-07-13 13:44:13 -07:00
Wink Saville
a3b4b5ca19
am c101c56e: Use resetConnections with resetMask.
...
* commit 'c101c56ecc4d6a0440225ed8550faa09dc4cd81b':
Use resetConnections with resetMask.
2011-07-08 09:40:08 -07:00
Wink Saville
c101c56ecc
Use resetConnections with resetMask.
...
Bug: 4981919
Change-Id: I5dec2da0756d5083bc81494fd583672704537694
2011-07-07 16:17:06 -07:00
Wink Saville
3f2f58e9d5
am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE
...
* commit 'f49e4d3f182071081537dba3387db20cae27c427':
Temporary re-enabling iface name change handling on HO
2011-06-23 18:25:38 -07:00
Kazuhiro Ondo
0768006559
Temporary re-enabling iface name change handling on HO
...
Temporary accept interface name change in ConnectivityService.
See bug/4455071.
Bug: 4903011
Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a
2011-06-23 14:58:50 -07:00
Robert Greenwalt
7fb0b2856f
am db32c8c5: Merge "Restrict access to protected networks." into honeycomb-LTE
...
* commit 'db32c8c540fa478e5f89d57f437d2f7e5366e4c3':
Restrict access to protected networks.
2011-06-23 08:19:48 -07:00
Robert Greenwalt
db32c8c540
Merge "Restrict access to protected networks." into honeycomb-LTE
2011-06-23 08:04:48 -07:00
Robert Greenwalt
6cac07422e
Restrict access to protected networks.
...
Some networks should only be brought up and controlled by system apps.
bug: 4585677
Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b
2011-06-22 16:35:12 -07:00
Irfan Sheriff
be85929569
am 9a33301d: resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
...
* commit '9a33301da1fdff65836443538935b1c77ba0cb1a':
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
2011-06-22 11:19:09 -07:00
Irfan Sheriff
9a33301da1
resolved conflicts for merge of ea8e3c23 to honeycomb-LTE
...
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
2011-06-22 11:01:16 -07:00
Irfan Sheriff
060e2a4a98
am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
...
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
2011-06-22 07:47:16 -07:00
Irfan Sheriff
a565295565
resolved conflicts for merge of 267a6181 to honeycomb-LTE
...
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
2011-06-22 07:11:42 -07:00
Irfan Sheriff
ea8e3c2322
Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
...
This reverts commit a3663884ca .
2011-06-21 14:26:37 -07:00
Irfan Sheriff
a3663884ca
DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
...
This reverts commit 9cfe6197fb .
Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64
2011-06-21 11:38:23 -07:00
Robert Greenwalt
796539b12a
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp
...
Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713
2011-06-20 12:15:24 -07:00
Robert Greenwalt
33cdcdf2fa
Fix tethering upstream determination.
...
Used to use iface names, but on mobile ifaces are multipurpose.
Refined to use ConnectivityService types.
bug:4530116
Change-Id: Iaa632d5f540d27ffff683bd7d94f8004bf422e71
2011-06-20 11:09:23 -07:00
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