Message	SHA1
am e0f7bc0b: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp ... * commit 'e0f7bc0b84': Simplfy getActive* calls in ConnectivityService Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-21 21:35:38 -07:00	1b507045bd
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
Merge f024027b ... Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b Jean-Baptiste Queru   commited 2011-05-19 07:54:53 -07:00	65727c9c5d
am a9f139c4: am 3a34041f: Linkproperties update via unsol data call state change. ... * commit 'a9f139c4f0': Linkproperties update via unsol data call state change. Kazuhiro Ondo   authored and   Android Git Automerger   commited 2011-05-18 17:48:37 -07:00	842c177850
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
Extract NetworkManagementService out from Tethering to ConnectivityService. ... and also some minor refactoring. Change-Id: I0e74f30ef1b035d9ed37571c512fedc15d05db77 Chia-chi Yeh   commited 2011-05-11 17:06:07 -07:00	4df51328bd
am f490d721: am e6848fac: Merge "Fix the adding of host routes." into honeycomb-LTE ... * commit 'f490d72195': Fix the adding of host routes. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-11 13:07:38 -07:00	b5c62b6230
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 df6da5c9: am aae781f3: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE ... * commit 'df6da5c96b': Add auto-restore timeout for secondary networks. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-05-04 12:47:30 -07:00	e7dcc1362f
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
resolved conflicts for merge of 90faa5de to master ... Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6 Robert Greenwalt   commited 2011-05-02 14:41:57 -07:00	b0d1452d58
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 75b5e996: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE ... * commit '75b5e9967f': ConnectivityService needs to use the new names for the NetConfig vars. Wink Saville   authored and   Android Git Automerger   commited 2011-04-07 14:31:20 -07:00	75d9e1cd13
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
am 1a087f0f: resolved conflicts for merge of 2879f735 to honeycomb-plus-aosp ... * commit '1a087f0f01': Add external dependency API. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-04-07 14:22:03 -07:00	f7ca6f7ddf
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
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp ... * commit '1851011379': Only leave one default network up at a time. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-04-04 16:44:25 -07:00	198b24d59a
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 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 a bad merge. ... Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread after the bad merge was reverted by master change 104487 (Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4). bug:4157610 Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6 Robert Greenwalt   commited 2011-04-01 10:51:22 -07:00	1e2f286a27
Fix the build. ... Fix a bad merge. Change-Id: I45d418a8868c9cab1b142ef997ad1d3550d11eee Robert Greenwalt   commited 2011-03-31 10:44:47 -07:00	f7dae30b20
Fix the build ... Revert "am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp" This reverts commit fbba87d35f, reversing changes made to ce8a55db6feae11c1db45a868a7d8a0e7d105471. Michael Jurka   commited 2011-03-30 19:57:12 -07:00	837e36441b
am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp ... * commit '047f9d12976d90d0931a64a256bb4843d77f5e20': Fix some alt-network issues. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-30 16:40:23 -07:00	fbba87d35f
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
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
Fix some alt-network issues. ... Two issues. 1) remove default routes for non-default networks. 2) don't report mobile is the active default network just because it is active. bug:4157610 Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f Robert Greenwalt   commited 2011-03-25 08:59:08 -07:00	a71471ba9a
am 5635dc93: am 23a9f024: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 ... * commit '5635dc9313dc6ca3ea739e4ca36c42a2c58537e9': Fix adding of default route. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-22 21:40:54 -07:00	b471d761d2
am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 ... * commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516': Fix adding of default route. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-22 21:37:48 -07:00	23a9f02497
Fix adding of default route. ... If you deleted the host routes (started a secondary network like mms, supl of hipri and then ended it) you would lose the host route to the default gateway. Then if you needed to re-add the default gateway route (lost the connection and removed the default route and then re-established) you couldn't - can't add a gateway that isn't routable apparently. This happens if you are in a video chat and lose your connection without losing the interface (PPP keeps it up for a bit). Fixed it by having addDefaultRoute first add a hsot route for the gateway before adding the default route. This allows the default add to succeed. bug:3490353 Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b Robert Greenwalt   commited 2011-03-22 18:47:42 -07:00	03d53da1f5
Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support" ... This reverts commit bbba216fe3 and is the first of the LTE commits in master being back ported to the LTE branch. Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7 Wink Saville   commited 2011-03-14 12:25:04 -07:00	b7c92c720f
am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread ... * commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8': DO NOT MERGE Backport of I1f55df8a from master. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-03-11 11:52:31 -08:00	102b5464b7
DO NOT MERGE Backport of I1f55df8a from master. ... Fixes false reporting of NO_CONNECTION. bug:4057115 Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6 Robert Greenwalt   commited 2011-03-10 17:04:21 -08:00	9e081592aa
am 141623d4: DO NOT MERGE WiMAX support ... * commit '141623d480': DO NOT MERGE WiMAX support TK MUN   authored and   Android Git Automerger   commited 2011-03-09 22:54:44 -08:00	8cca8f4c4f
DO NOT MERGE WiMAX support ... - In Connectivity service, start WiMAX service - 4G icon display in StatusBarPolicy - Add DHCP renew - Add radio for WiMAX Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd Signed-off-by: TK MUN <tk.mun@samsung.com> TK MUN   authored and   Simon Wilson   commited 2011-03-09 22:37:08 -08:00	141623d480
Add support for USB Ethernet adapters ... Change-Id: Ie75cbcdb1b0c8965b59b89675a05175a1e9ebdd6 Benoit Goby   commited 2011-03-04 15:42:23 -08:00	211b569c04
DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support" ... This reverts commit f6b7669493. Change-Id: Ifc4e9aaccb54e065a36380710694cd6e4d347636 Wink Saville   commited 2011-03-03 09:53:52 -08:00	bbba216fe3