Message	SHA1
resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp ... Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9 Robert Greenwalt   commited 2011-07-25 12:08:19 -07:00	aaf31586ce
am 9810742c: Add better routes for secondary DNS ... * commit '9810742cd8': Add better routes for secondary DNS Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-22 13:15:56 -07:00	6ef5bd7a00
Add better routes for secondary DNS ... We'd been doing no-gateway hostroutes for dns servers on secondary nets, but on some devices (multi-homed stingray) this is a problem. Add gateway-ed hostroutes instead so the BP can do it's nonstandard "magical" demultiplexing. bug:5011392 Change-Id: Ia48f69c8ddf2a37cfb8f014f078f96bf601d2ddb Robert Greenwalt   commited 2011-07-22 12:52:21 -07:00	9810742cd8
First pass tying into per-interface DNS cache ... Change-Id: Iacce225d392786e37fa2dbf9647045fca0b70e64 Robert Greenwalt   commited 2011-07-20 14:47:41 -07:00	44cc474470
am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE ... * commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43': Fix FeatureUser leak in ConnectivityService Wink Saville   authored and   Android Git Automerger   commited 2011-07-19 12:39:42 -07:00	4dd0424da1
Fix FeatureUser leak in ConnectivityService ... In case infinite restoral timer is used for a network feature, FeatureUser could be keep added but never released if a user is keep calling "startUsingNetworkFeature". This patch will add duplication check when adding a FeatureUser into the list in case infinite restoral timer is used. Bug: 5043513 Change-Id: I47e7076e217f201454fae33ce596ecdc63cf7908 Kazuhiro Ondo   authored and   Wink Saville   commited 2011-07-19 12:02:01 -07:00	cae18f1a8e
am 57c83bb4: Small fix to 5008973 fix. ... * commit '57c83bb4e6': Small fix to 5008973 fix. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-15 10:20:48 -07:00	2ff2707df4
resolved conflicts for merge of e8d2a4a8 to honeycomb-plus-aosp ... Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783 Robert Greenwalt   commited 2011-07-15 09:55:48 -07:00	d57579a4a4
Small fix to 5008973 fix. ... Removed redundent log. Cleaned some logic. Will try to modify route even if recursive operation had an error. bug: 5008973 Change-Id: Ie2ca51cc39cfac027a8a2e2eaddcb7d6c378c4da Robert Greenwalt   commited 2011-07-15 09:45:08 -07:00	57c83bb4e6
Apply the dns and route diff which we get a change ... bug:5008973 Change-Id: Ib99e43d9d852452cc1f2aea6bef07bbd194f28cc Robert Greenwalt   commited 2011-07-14 18:12:14 -07:00	e8d2a4a8a0
am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE ... * commit '6d1d16c324a681dd966d47497a71a02eac512234': Remove STOPSHIP but allow seamless Handoff when possible. Wink Saville   authored and   Android Git Automerger   commited 2011-07-13 14:19:12 -07:00	6b5e201d47
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 Wink Saville   commited 2011-07-13 13:44:13 -07:00	051a664b14
am c101c56e: Use resetConnections with resetMask. ... * commit 'c101c56ecc': Use resetConnections with resetMask. Wink Saville   authored and   Android Git Automerger   commited 2011-07-08 09:40:08 -07:00	a3b4b5ca19
Use resetConnections with resetMask. ... Bug: 4981919 Change-Id: I5dec2da0756d5083bc81494fd583672704537694 Wink Saville   commited 2011-07-07 16:17:06 -07:00	c101c56ecc
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 Wink Saville   authored and   Android Git Automerger   commited 2011-06-23 18:25:38 -07:00	3f2f58e9d5
Temporary re-enabling iface name change handling on HO ... Temporary accept interface name change in ConnectivityService. See bug/4455071. Bug: 4903011 Change-Id: I7f06c2ca83535b981f047cb671e08550aed7df1a Kazuhiro Ondo   authored and   Wink Saville   commited 2011-06-23 14:58:50 -07:00	0768006559
am db32c8c5: Merge "Restrict access to protected networks." into honeycomb-LTE ... * commit 'db32c8c540': Restrict access to protected networks. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-06-23 08:19:48 -07:00	7fb0b2856f
Restrict access to protected networks. ... Some networks should only be brought up and controlled by system apps. bug: 4585677 Change-Id: I61b1ee3dcfca0ee54387cecffe5198a0b010d98b Robert Greenwalt   commited 2011-06-22 16:35:12 -07:00	6cac07422e
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp ... Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713 Robert Greenwalt   commited 2011-06-20 12:15:24 -07:00	796539b12a
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 Robert Greenwalt   commited 2011-06-20 11:09:23 -07:00	33cdcdf2fa
am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE ... * commit '5f3505121b761dbd3bba62d1603fbab49de139b9': Reset connections AFTER we take down the network. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-06-16 12:42:15 -07:00	00ca322d5d
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 Robert Greenwalt   commited 2011-06-16 11:26:54 -07:00	36ea869426
resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp ... Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d Robert Greenwalt   commited 2011-05-20 15:45:55 -07:00	e0f7bc0b84
Simplfy getActive* calls in ConnectivityService ... One had been simplified on GB, but somehow it didn't make it here. bug: 4463770 Change-Id: Ica51e836b1a7a489526a223168910b8e06c99c2b Robert Greenwalt   commited 2011-05-20 12:23:41 -07:00	e1544bb9ea
am 355205c0: Switch to use netd to add/remove routes. ... * commit '355205c0cd': Switch to use netd to add/remove routes. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-18 16:33:16 -07:00	f024027b55
Switch to use netd to add/remove routes. ... Also adds support for v6 routes and for removing single routes. Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01 Robert Greenwalt   commited 2011-05-18 15:25:43 -07:00	355205c0cd
am 3a34041f: Linkproperties update via unsol data call state change. ... * commit '3a34041f80': Linkproperties update via unsol data call state change. Kazuhiro Ondo   authored and   Android Git Automerger   commited 2011-05-18 00:02:31 -07:00	a9f139c4f0
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 Kazuhiro Ondo   authored and   Wink Saville   commited 2011-05-17 20:53:40 -07:00	3a34041f80
am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE ... * commit 'e6848faceff58f84f671dbc73be08ef7890fea09': Fix the adding of host routes. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-10 11:53:57 -07:00	f490d72195
Fix the adding of host routes. ... We used to just add Change-Id: I991e4cc976cc2932887dd3242fd50e013d521b0a Robert Greenwalt   commited 2011-05-10 11:27:46 -07:00	bd49221570
am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE ... * commit 'aae781f32b': Add auto-restore timeout for secondary networks. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-04 10:02:16 -07:00	df6da5c96b
Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-05-04 09:59:30 -07:00	aae781f32b
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 Robert Greenwalt   commited 2011-05-03 19:10:26 -07:00	20f819c64b
am 5afb4666: Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE ... * commit '5afb46660c': Add RouteInfo objects for tracking routes. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-02 13:29:22 -07:00	90faa5de18
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 Robert Greenwalt   commited 2011-05-02 11:17:30 -07:00	5a901298ed
am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE ... * commit 'c40de32ef7': Add support for USB Ethernet adapters Benoit Goby   authored and   Android Git Automerger   commited 2011-04-11 18:53:57 -07:00	d27954e05a
resolved conflicts for merge of 6cec7f35 to honeycomb-LTE ... Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92 Benoit Goby   commited 2011-04-11 18:41:23 -07:00	c40de32ef7
Add support for USB Ethernet adapters ... Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d Benoit Goby   commited 2011-04-11 16:33:43 -07:00	6cec7f3535
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. Wink Saville   authored and   Android Git Automerger   commited 2011-04-07 14:29:17 -07:00	75b5e9967f
ConnectivityService needs to use the new names for the NetConfig vars. ... Change-Id: I809a624057462871cd1849051286c2bffd5099e9 Wink Saville   commited 2011-04-07 14:23:45 -07:00	f2a6283da9
resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp ... Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f Robert Greenwalt   commited 2011-04-07 14:13:52 -07:00	1a087f0f01
Add external dependency API. ... An APN will not be connected to if some external dependency is not met. bug:3486704 Change-Id: I7d94df343b260013efd11faa978deb13f07f1389 Robert Greenwalt   commited 2011-04-07 12:28:37 -07:00	34848c0192
resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp ... Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf Robert Greenwalt   commited 2011-04-04 16:26:42 -07:00	1851011379
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 Simon Wilson   authored and   Android Git Automerger   commited 2011-04-04 12:25:25 -07:00	0249717644
am 9991017b: Only leave one default network up at a time. ... * commit '9991017bbd': Only leave one default network up at a time. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-04-04 12:18:58 -07:00	e00e35a54c
Fix the build. ... Fix a bad merge. Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee Robert Greenwalt   commited 2011-03-31 10:44:47 -07:00	f7dae30b20
resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp ... Change-Id: I4c3c382cc5cd89f8a4437cf17836fb42f9417ee1 Robert Greenwalt   commited 2011-03-30 15:03:13 -07:00	3a378b9f2d
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> TK MUN   authored and   Simon Wilson   commited 2011-03-30 13:18:23 -07:00	dc9a535917
am 568845a7: Merge "Fix some alt-network issues." into gingerbread ... * commit '568845a766cddc4e4c222b4d9de064f8a48da990': Fix some alt-network issues. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-30 09:30:15 -07:00	b2f5deca7d
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 Robert Greenwalt   commited 2011-03-29 11:36:28 -07:00	9991017bbd