Message	SHA1
resolved conflicts for merge of 40717996 to master ... Change-Id: Ie5c0f1f20c313d6c568b3b06f778f75223914ada Robert Greenwalt   commited 2011-06-24 16:10:06 -07:00	968330fae8
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 796539b1 to master ... Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f Robert Greenwalt   commited 2011-06-22 13:20:14 -07:00	09d6cdf338
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
Notify policy listeners about metered ifaces. ... Currently, kernel definition of metered networks is applied at the interface level. This change maintain list of those metered ifaces and notifies policy listeners, like ConnectivityService. (This gives us a consistent picture of when a network would be blocked.) Bug: 4601393 Change-Id: I277d5ca96ab967a1c1c3f1da8f9587557cd6d74c Jeff Sharkey   commited 2011-06-17 16:49:21 -07:00	a47d7a1a70
Merge "DownloadManager flags for network policy." Jeff Sharkey   authored and   Android (Google) Code Review   commited 2011-06-16 13:39:02 -07:00	29fc3322d5
DownloadManager flags for network policy. ... Handful of DownloadManager flags to record when a download was paused because of NetworkPolicyManager rules. Change-Id: I99fc47f529cb6c8a42dbeca049e0cd0f1556eac4 Jeff Sharkey   commited 2011-06-16 13:04:34 -07:00	4434b0b55b
am 00ca322d: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE ... * commit '00ca322d5d': Reset connections AFTER we take down the network. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-06-16 12:50:46 -07:00	9d145fde31
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
VPN: migrate from generic Bundle to our own Parcelable VpnConfig. ... Note that VpnConfig is for internal use only. Also remove hidden methods from ConnectivityManager. Change-Id: Ic298c4dc9a2c6c452bd8f4be6fa84e7ac489c0c4 Chia-chi Yeh   commited 2011-06-15 17:08:58 -07:00	75cacd5525
The service part of the user space VPN support. ... The dialogs will be in another change. Change-Id: I0cdfd2ef21ffd40ee955b3cbde5ada65dbfdb0bc Chia-chi Yeh   commited 2011-06-08 14:16:42 -07:00	9a4ad7d52c
Map network identity using ConnectivityService. ... Instead of deriving network identity based on raw subsystem broadcasts, listen for updates from ConnectivityService. Added atomic view of all active NetworkState, and build map from "iface" to NetworkIdentity set for stats tracking. To avoid exposing internal complexity, INetworkStatsService calls use general templates. Added TelephonyManager mapping to classify network types using broad labels like "3G" or "4G", used to drive templates. Cleaned up Objects and Preconditions. Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91 Jeff Sharkey   commited 2011-06-07 23:09:25 -07:00	21062e7c7e
Merge "Do not register the callbacks in the constructor." Chia-chi Yeh   authored and   Android (Google) Code Review   commited 2011-06-07 18:18:56 -07:00	ab2c05370e
Policy and rules work for ConnectivityManager. ... Teach ConnectivityManager about UID-specific rules derived from policy, such as rejecting network traffic on "paid" interfaces. Calls that return NetworkInfo now filter based on any REJECT rules in effect for the calling UID. (Added uid parameter if callers that still want all interfaces.) Changed NetworkPolicyManager to derive rules based on current policy combined with PowerManager and ActivityManager status, which it passes to ConnectivityService for eventual enforcement through netd. When rules change the usability of a NetworkInfo for a specific UID, it also dispatches CONNECTIVITY_ACTION broadcasts to that UID. Combined paid and background policy together to match current working definition. Change-Id: I797ea49439fcc487cfe2cbc16703d4b91ceb9af6 Jeff Sharkey   commited 2011-06-01 17:00:42 -07:00	921ebf2ee5
Move stringToFile utility from ConnectivityService to FileUtils ... Change-Id: I59a2dc649d59677f6b5e7ade252587c7c151ec06 Signed-off-by: Mike Lockwood <lockwood@android.com> Mike Lockwood   commited 2011-05-28 13:28:12 -04:00	0d5916c21e
Do not register the callbacks in the constructor. ... Change-Id: Ic7509c35cfb17b022a2af3cc14170942d6510e2d Chia-chi Yeh   commited 2011-05-23 15:08:29 -07:00	f3204aad8e
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