Message	SHA1
am 30f045c9: am a50a0e90: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE ... * commit '30f045c900': Fix NPE when going from proxy to no proxy. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-29 10:55:58 -07:00	6e02db1b8d
am a50a0e90: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE ... * commit 'a50a0e90fd': Fix NPE when going from proxy to no proxy. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-29 10:53:16 -07:00	30f045c900
Fix NPE when going from proxy to no proxy. ... bug:5081431 Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833 Robert Greenwalt   commited 2011-07-29 10:03:37 -07:00	027f505669
resolved conflicts for merge of 377cf20b to master ... Change-Id: Ib7f3521b0af6df9346cf940d69f2988b1c87e129 Robert Greenwalt   commited 2011-07-27 10:00:36 -07:00	49f762eeee
resolved conflicts for merge of 9520d6af to honeycomb-plus-aosp ... Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3 Robert Greenwalt   commited 2011-07-27 09:27:00 -07:00	377cf20b83
resolved conflicts for merge of 9520d6af to honeycomb-plus-aosp ... Change-Id: If4dc99c558dc45c9a7ff8d3ea5be69578b4ee793 Robert Greenwalt   commited 2011-07-26 15:26:02 -07:00	4d5ecf6bb2
Merge "Use dns proxy a bit." into honeycomb-LTE Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-07-26 13:21:09 -07:00	9520d6af5a
Use dns proxy a bit. ... Sets the current default interface and sets the dns per interface. port of changes 23041 and 22098 from opensource. bug:5060618 Change-Id: I80e7ef88727eeb8ff2b48059f69b270e5a6b5c16 Robert Greenwalt   commited 2011-07-25 17:00:13 -07:00	fd0597c8e4
resolved conflicts for merge of aaf31586 to master ... Change-Id: I9e8faaa94f9b251a9c003dc6b9a3e2a97c4564a9 Robert Greenwalt   commited 2011-07-25 16:06:25 -07:00	fce7186be1
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
Merge "Fix USB tethering" Mike Lockwood   authored and   Android (Google) Code Review   commited 2011-07-23 19:36:32 -07:00	865fcf3eb3
Fix USB tethering ... The previous approach no longer works with the new USB drivers, since the usb0 interface is no longer enabled by default. This introduced a chicken & egg problem - usb0 will not be enabled until the user tries to start tethering, but Settings will not enable the checkbox unless usb0 is enabled. To fix this we add an explicit call to start USB tethering in the connectivity manager. This will enable RNDIS if necessary and then bring up tethering once usb0 is enabled. Change-Id: Iae1f733366aa6b0dafa66d4c97207794173ef54b Signed-off-by: Mike Lockwood <lockwood@android.com> Mike Lockwood   commited 2011-07-23 21:57:55 -04:00	ed4a1741b4
am 6ef5bd7a: am 9810742c: Add better routes for secondary DNS ... * commit '6ef5bd7a00': Add better routes for secondary DNS Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-22 13:17:54 -07:00	da15bead3c
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
Merge "ConnectivityService: Implement VPN callbacks to update DNS servers." Chia-chi Yeh   authored and   Android (Google) Code Review   commited 2011-07-20 12:28:04 -07:00	dee9654b9d
Merge "Start default connections on startup." Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-07-20 10:10:24 -07:00	3a2a215c97
ConnectivityService: Implement VPN callbacks to update DNS servers. ... Change-Id: I7b5063f0344a2a5c2754600386982e870adc1161 Chia-chi Yeh   commited 2011-07-19 17:15:41 -07:00	cc844502e2
am 4dd0424d: am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE ... * commit '4dd0424da1': Fix FeatureUser leak in ConnectivityService Wink Saville   authored and   Android Git Automerger   commited 2011-07-19 12:42:01 -07:00	8f3e3bca45
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
Start default connections on startup. ... On devices with mobile data we were kind of doing this in Telephony. Devices without could use this. bug:5030831 Change-Id: I9940561e88e43917bc8e638f5c3b15fced3821ae Robert Greenwalt   commited 2011-07-15 11:16:45 -07:00	497ff5e731
am 2ff2707d: am 57c83bb4: Small fix to 5008973 fix. ... * commit '2ff2707df4': Small fix to 5008973 fix. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-07-15 11:03:52 -07:00	804e1eaec6
resolved conflicts for merge of d57579a4 to master ... Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81 Robert Greenwalt   commited 2011-07-15 10:52:54 -07:00	3079c1666e
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
VPN: close the socket in protectVpn() to avoid leaking descriptors. ... Change-Id: Idda0c2ea1770abc490566e894711bcb08f60b354 Chia-chi Yeh   commited 2011-07-14 16:19:19 -07:00	9e4ff6ef91
Fix build. ... Changes in ConnectivityService in hc-LTE when merged with changes happening in Master caused the build to break. Change-Id: I92a0b782ae58e9789b1e950c94ef966234fa94af Wink Saville   commited 2011-07-14 12:23:28 -07:00	dc5d1badd0
am 6b5e201d: am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE ... * commit '6b5e201d47': Remove STOPSHIP but allow seamless Handoff when possible. Wink Saville   authored and   Android Git Automerger   commited 2011-07-14 10:55:58 -07:00	d622c319ae
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
resolved conflicts for merge of a3b4b5ca to master ... Change-Id: I50f8fe61303efa78f5d450ddda1483e0ecb81d12 Wink Saville   commited 2011-07-08 12:49:14 -07:00	620e1078ec
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
VPN: implement status report for legacy VPN. ... Change-Id: I81c28dafd9588572df76cbc303b0d6a0f41f9bc6 Chia-chi Yeh   commited 2011-07-04 03:23:12 -07:00	bded3eb138
VPN: convert prepare() into a form which helps solve race conditions. ... When someone tries to revoke packageA, it is possible that packageA is already revoked by packageB. In this case packageB should not be revoked, and the new prepare() can help solve this problem. Change-Id: Iee056a191dd99467b8ad1b5379a17b02d404bad1 Chia-chi Yeh   commited 2011-07-03 17:03:27 -07:00	3e2e1da0a0
VPN: remove the old VpnService. ... Now VPN is (kind of) integrated into ConnectivityService. Change-Id: If98e456e779f8e97f562d99c57d909b1f5d9db55 Chia-chi Yeh   commited 2011-07-02 20:21:09 -07:00	6c500a4c5a
VPN: export legacy VPN in IConnectivityManager. ... Change-Id: I016fe056ceab39ffc36aa235d14b30a9f094a2e1 Chia-chi Yeh   commited 2011-07-02 17:15:00 -07:00	7e026b38e9
VPN: Use List<String> instead for dnsServers and searchDomains. ... Change-Id: I5d72c182ad47f59121a04b68ec6c2d164e2d00a8 Chia-chi Yeh   commited 2011-07-01 01:14:19 -07:00	d050d1c82c
am 3f2f58e9: am f49e4d3f: Merge "Temporary re-enabling iface name change handling on HO" into honeycomb-LTE ... * commit '3f2f58e9d5': Temporary re-enabling iface name change handling on HO Wink Saville   authored and   Android Git Automerger   commited 2011-06-27 14:14:45 -07:00	efaa396ae9
Merge "WifiWatchdogService - disable bad connections" Irfan Sheriff   authored and   Android (Google) Code Review   commited 2011-06-25 11:20:54 -07:00	e7bfeb3d77
resolved conflicts for merge of 40717996 to master ... Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada Robert Greenwalt   commited 2011-06-24 16:10:06 -07:00	968330fae8
WifiWatchdogService - disable bad connections ... Complete rewrite of WifiWatchdogService.java. Checking for connectivity and managing wifi upon failure detection. Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44 Isaac Levy   commited 2011-06-24 15:48:10 -07:00	5cdb9c934c
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