Message	SHA1
resolved conflicts for merge of 510d0a75 to master ... Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86 Robert Greenwalt   commited 2011-06-08 10:01:06 -07:00	269d732e13
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
resolved conflicts for merge of 8de47a2f to honeycomb-LTE ... Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749 Robert Greenwalt   commited 2011-06-07 12:45:41 -07:00	f17deff97b
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
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 Robert Greenwalt   commited 2011-05-31 12:06:08 -07:00	6a9d45449d
am 2a4ebb81: am 049694bf: Merge "Reset connection while data state changed." into honeycomb-LTE ... * commit '2a4ebb810d': Reset connection while data state changed. Wink Saville   authored and   Android Git Automerger   commited 2011-05-19 11:32:27 -07:00	1dc369c378
Merge "Reset connection while data state changed." into honeycomb-LTE Wink Saville   authored and   Android (Google) Code Review   commited 2011-05-19 11:25:45 -07:00	049694bfa2
Merge f024027b ... Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b Jean-Baptiste Queru   commited 2011-05-19 07:54:53 -07:00	65727c9c5d
Reset connection while data state changed. ... Check data call states and reset connection if any link properties changed. Change-Id: I008aea969378648192852161959fdf4aad6211a1 Wink Saville   commited 2011-05-18 15:59:04 -07:00	f23fb20d13
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
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 Irfan Sheriff   commited 2011-05-12 14:10:11 -07:00	9cfe6197fb
am f4c231c4: am 76a118dd: Merge "Fix initialization of RouteInfo" into honeycomb-LTE ... * commit 'f4c231c4dc': Fix initialization of RouteInfo Wink Saville   authored and   Android Git Automerger   commited 2011-05-12 14:08:05 -07:00	a8f3f7c298
Fix initialization of RouteInfo ... IPv6 gateway is not correctly set in RouteInfo Change-Id: I24b1ab71a64e3097c9ba641899240fc27847b86c Kazuhiro Ondo   authored and   Wink Saville   commited 2011-05-11 16:02:00 -07:00	efa66d9fe9
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
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
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 78204ba5: am 8ab6a6d4: Merge "Add DhcpStateMachine for interation with dhcpcd" into honeycomb-LTE ... * commit '78204ba57c': Add DhcpStateMachine for interation with dhcpcd Irfan Sheriff   authored and   Android Git Automerger   commited 2011-05-02 13:29:36 -07:00	52b5163b83
Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTE Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-05-02 13:26:52 -07:00	5afb46660c
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
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 Irfan Sheriff   commited 2011-04-30 12:58:51 -07:00	204cec7dd5
am 8177aee2: am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE ... * commit '8177aee2dc': Make new networkAttribute parameter non-optional. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-04-26 01:35:39 -07:00	ef903acab4
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 Robert Greenwalt   commited 2011-04-25 16:04:45 -07:00	2240524be9
Expose more net types to the public. ... Ethernet and bluetooth. Change-Id: Ic499709ffa151c0f27aef497373a8de7289e3e7f Robert Greenwalt   commited 2011-04-22 18:09:03 -07:00	f76c55d289
Add support for USB Ethernet adapters ... Change-Id: I6ae34a32d0e1b6f21c484b8639c3e7ce086e568d Benoit Goby   commited 2011-04-11 16:33:43 -07:00	6cec7f3535
Merge "Add external dependency API." into honeycomb-LTE Robert Greenwalt   authored and   Android (Google) Code Review   commited 2011-04-07 13:02:28 -07:00	2879f7352b
Make LinkProperties comparable. ... Add equals() and hashcode() to LinkProperties and related fields. Bug:3501569 Change-Id: Ifa737a67c16867ac43cf76bf618a483e612a189e John Wang   commited 2011-04-07 12:36:56 -07:00	3e567d5c3a
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
Do not merge: Add some input checking to prevent problems ... Adding nulls can cause unhappiness. It's suspected as a cause of 3495045. bug:3495045 Change-Id: I925c965ef64032fc57849bf15fe9b11f4bc99351 Robert Greenwalt   authored and   Wink Saville   commited 2011-03-14 12:25:09 -07:00	dab2c6223e
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
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
LTE Changes for Telephony including Multiple PDN support and IPV6 support ... Added init for CDMAPhone.java Change-Id: I2392b5ad3382ee1993537b8477ef00dd036c6fe9 Wink Saville   commited 2011-02-24 18:23:36 -08:00	f6b7669493
Use InetAddress.parseNumericAddress. ... Bug: 3300307 Change-Id: I4ebfe533056e67931db1117e934596ba7b5c8b75 Elliott Hughes   commited 2011-02-15 17:11:29 -08:00	3064b9e18e
Remove more use of netmask ... bug:2542681 Change-Id: Ifd75672739ee8262d4df22afd8173e4f3f67260d Robert Greenwalt   commited 2011-02-14 14:32:33 -08:00	7fae12cc19
Update LinkProperties treatment of gateways ... A link can have multiple gateways (think ipv4/ipv6 for a trivial example). . bug:3438810 Change-Id: I28c90a6947cd50b82e5ca9a0113148f98b3f4dd8 Robert Greenwalt   commited 2011-02-11 11:06:23 -08:00	5c733977a4
am 996d60e3: resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp ... * commit '996d60e3a5': Add some network types that OEM's are asking for. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-01-29 09:35:28 -08:00	f2b39b4773
resolved conflicts for merge of 36165a67 to honeycomb-plus-aosp ... Change-Id: I7a3445f7df2a66c70f630fa63ceb4ae150d70963 Robert Greenwalt   commited 2011-01-29 09:32:04 -08:00	996d60e3a5
am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread ... * commit '6b739dc7292452227cdd8abd90658f4db8f0ce70': Add some network types that OEM's are asking for. Robert Greenwalt   authored and   Android Git Automerger   commited 2011-01-29 06:55:38 -08:00	36165a676a
Add some network types that OEM's are asking for. ... Adding them hidden so that if OEM's are rolling their own at least they can use the same values. Will mark them unhidden in a future sdk release. bug:3395729 Change-Id: I90eabe036a96e1aa7c8cac49ca51efd9b1776a0c Robert Greenwalt   commited 2011-01-28 14:48:37 -08:00	9d07781cb6
Fix the build ... Check for null before trying to make InetAddresses. Change-Id: I3228eea32eb455437dd76be2de56a913884f3f6e Robert Greenwalt   commited 2011-01-27 10:49:27 -08:00	52ef39aff1
Get rid of manual int->ipv4 string generation ... bug:2542681 Change-Id: I67919d7b5dc8d72eeb2dfb9e3906210b1951d4fb Robert Greenwalt   commited 2011-01-26 13:57:24 -08:00	3ec1eeea3a
Make the interface with DHCP IPv6 capable. ... It doesn't work (yet) for IPv6, but we can remove v4-centric notions from the framework. bug:2542681 Change-Id: I21c058f5c88d07706c9265bf0ea902fc90357e56 Robert Greenwalt   commited 2011-01-26 09:10:01 -08:00	7baf8a8f08
Switch from NetworkUtils to netd for iface config. ... Moving more stuff to netd and getting rid of unused NetworkUtils. Change-Id: Ibb5a11dca58d07291fe33e6d33027553f6158ea7 Robert Greenwalt   commited 2011-01-21 10:44:12 -08:00	2e1763cb15
Deprecate a method that formats only IPv4 addresses. ... Anyone calling this method is probably storing IP addresses in an int, which doesn't make sense anymore. Change-Id: Iba535b66f6cff47ce07b5ecc6427e3b2fd846998 Jesse Wilson   commited 2011-01-06 19:33:00 -08:00	3741bedee7
Add TYPE_BLUETOOTH network interface for reverse tethering. ... Change-Id: I2aa61ce15f57aea9e8fd3a4cb56799c8bc51e998 Jaikumar Ganesh   commited 2010-12-22 15:24:18 -08:00	0db51a0631
Add a Dummy data connection for testing purposes. ... Enable with: <string-array translatable="false" name="networkAttributes"> <item>"wifi,1,1,1"</item> <item>"dummy,7,7,0"</item> </string-array> in your config.xml Change-Id: I3965edaeb4873e95131f4083b8d23d682ce17841 Robert Greenwalt   commited 2010-12-07 07:48:33 -08:00	eb123acefc
Notify all VMs when proxy changes. ... bug:2700664 Change-Id: I74cc6e0bd6e66847bf18f524ce851e3e9d2c4e87 Robert Greenwalt   commited 2010-11-19 10:24:30 -08:00	c3c5f865a3
Remove NetworkUtils.isIpAddress. ... Bug: 3073384 Change-Id: I5bd46d1995186c2384c68d0afff3b869f46624c5 Elliott Hughes   commited 2010-11-04 15:27:33 -07:00	29666e46f4