Message	SHA1
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
Use LinkProperties for IP and proxy configuration ... Change-Id: I4ae817fb00141e9a742216b7fd02dca1ed228270 Irfan Sheriff   commited 2010-10-08 12:41:11 -07:00	e0b2c0fdc4
Add LinkAddress ... LinkAddress stores IP address + prefix for a network link Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f Irfan Sheriff   commited 2010-10-06 11:04:05 -07:00	fb7c96415b
use hostname when address null ProxyProperties parcelling ... In ProxyProperties parcel, use toString so that hostname is used when address is null Change-Id: I4813dbdaf3c4a7bb404edf960d0f990c732ec0b8 Irfan Sheriff   commited 2010-09-27 12:16:11 -07:00	30bdeb33fe
Cleanup copyright dates add missing method. ... Change-Id: I2d8fe0b705e7c90efabb8b3427a539a4a1056874 Wink Saville   commited 2010-09-21 09:16:38 -07:00	1746543a54
Enhance http proxy support ... Make it read proxys the correct way from CS so it works for all network types. Add utility class for apache http client support. bug:2700664 Change-Id: If81917b19b5f0636247a6519a1ec78bd8dbf3596 Robert Greenwalt   commited 2010-09-17 16:14:10 -07:00	9f0ee4fcde
am 7d6070c3: am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread ... Merge commit '7d6070c3fd' * commit '7d6070c3fd': Update Inet Connection Status display Robert Greenwalt   authored and   Android Git Automerger   commited 2010-09-15 19:49:53 -07:00	978f509cea
am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread ... Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp * commit '134b28a7f049719cb74fd5baadbbcc5915bc861b': Update Inet Connection Status display Robert Greenwalt   authored and   Android Git Automerger   commited 2010-09-15 18:02:59 -07:00	7d6070c3fd
Update Inet Connection Status display ... Cellular signal strength should also be green - these assets aren't, but the art guys are working on that. Also using a new intent so we don't overload the CONNECTIVITY_ACTION and confuse the apps. bug:2994024 Change-Id: I6fe8f65dd6e9869d9724064c4fae45340491a4d8 Robert Greenwalt   commited 2010-09-15 17:54:17 -07:00	d3401f9b40
Add per network static IP settings ... Remove the existing global static IP settings and add support for per network configuration Change-Id: I5a6d8b877471b8c8ad07951c96d273893754607f Irfan Sheriff   commited 2010-09-14 16:15:22 -07:00	a416052905
Fix the build ... add '*' so javadoc recognizes a comment block and finds the required @hide.. Change-Id: If665ba6549f9e017c063ea2800b7970917c33bdf Robert Greenwalt   commited 2010-09-09 14:22:59 -07:00	b3102acc81
resolved conflicts for merge of ee6dfc50 to master ... Change-Id: I31297232c9d918a967b93c3ae977f81b6a94f2ed Robert Greenwalt   commited 2010-09-09 13:15:32 -07:00	24118e8a28
am 0727a865: Merge "Add network condition reporting." into gingerbread ... Merge commit '0727a865d83b944c2fecc0bf1228a36976fe5300' into gingerbread-plus-aosp * commit '0727a865d83b944c2fecc0bf1228a36976fe5300': Add network condition reporting. Robert Greenwalt   authored and   Android Git Automerger   commited 2010-09-09 09:49:15 -07:00	ee6dfc507a
Add network condition reporting. ... Apps can report if they like their connection to the nets and we display either not-really-connected or fully-connected icons. Final icons TBD. bug:2978624 Change-Id: I28be52085edfe54571c0d4559aba0df883548654 Robert Greenwalt   commited 2010-09-09 09:33:02 -07:00	986c741ac1
Some cleanup of Proxy class. ... Switch to using InetSocketAddress. Change-Id: Ibdb97fcd2d06eecaa1e847b78267180156089f27 Robert Greenwalt   commited 2010-09-03 16:18:41 -07:00	98f45836b6
Fix NPE in toString ... bug:2965739 Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977 Robert Greenwalt   commited 2010-09-01 10:09:40 -07:00	e422ad9819
Fix crash when proxy exclusion list is null. ... Also cleaned up source a little bit and eliminated a warning. Bug: 2964821 Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17 Andrew Stadler   commited 2010-08-31 14:28:58 -07:00	e55ada7892
Fix reboot loop due to NPE ... Bug: 2962059 Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b Irfan Sheriff   commited 2010-08-30 20:40:19 -07:00	fd151ec69b
Rename NetworkProperties to LinkProperties ... Also add copy constructors and use them when giving out data. Change-Id: Id320eb8fb91d0bd250305ce7bb4f628570215615 Robert Greenwalt   commited 2010-08-30 15:54:37 -07:00	1f1bcfe6a2
Merge "resolved conflicts for merge of 4ea54f44 to master" Robert Greenwalt   authored and   Android (Google) Code Review   commited 2010-08-27 17:27:02 -07:00	906eda5bac
Add NetworkProperties to DataConnection. ... Since we have NetworkProperties we can remove the individual accessors from Phone and its subclasses. Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8 Wink Saville   commited 2010-08-27 11:15:18 -07:00	7d85790ad8
resolved conflicts for merge of 4ea54f44 to master ... Change-Id: Ia77bb59a6e1950648c8ebf7db307e204f93a9f56 Robert Greenwalt   commited 2010-08-27 11:05:11 -07:00	7fe44cbc2b
resolved conflicts for merge of b998f311 to gingerbread-plus-aosp ... Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505 Robert Greenwalt   commited 2010-08-25 17:48:47 -07:00	7ac5d3748d
DO NOT MERGE Fixing Connectivity ... Passing Gateway addr info from telephony into ConnectivityService so it can add/remove the default route as needed. Fixed differently on master. bug:2927822 Change-Id: I9a3ee7cd23c4717e7c60098f0595aa3f77c44b15 Robert Greenwalt   commited 2010-08-20 10:01:55 -07:00	da9f734152
Add an API to request route to an IPv6 host. ... Add API to create a route to an IPv6 host through a particular interface. Change-Id: I7649051e94832576e02b5f5ad17abe093d21d48e Banavathu, Srinivas Naik   authored and   Banavathu Srinivas Naik   commited 2010-08-19 12:50:35 -07:00	7601f575aa
bluetooth tethering ... Change-Id: Id6d5fb1922facc7013abc29214d3e1141995b767 Danica Chang   commited 2010-08-18 15:07:50 -07:00	965670546b
Avoid hostname lookup in NetworkProperties ... Bug: 2870816 Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05 Irfan Sheriff   commited 2010-08-04 15:15:49 -07:00	a89f2ad616
Refactor WifiStateTracker ... Implement WifiStateTracker as a HSM. Change-Id: Ic12fd78f1f183b5c4dea8ad2301002267ceff0cb Irfan Sheriff   commited 2010-07-27 11:59:29 -07:00	653e2a2f64
Pass network properties to ConnectivityService. ... Used as a bag to hold ipaddr, gateway, dns, proxy info. addr's are InetAddresses for v4/v6 use. Cleaning up some old v4-only code bug:2655015 Change-Id: I7ac886fe5c519e8bab42f49cd82a5189d9c9ab59 Robert Greenwalt   commited 2010-07-13 18:07:41 -07:00	a7dfbd3a1d
Move the net transition wakelock to ConnService. ... When the default network goes down we lose the wake-on-incoming-data capability until the new net is brought up and apps rebuild their connections. We fixed this in Wifi, but it's a general connectivity issue, not a wifi issue so moving the mechanism to connecitivty so other networks can use it. bug:2734419 Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147 Robert Greenwalt   commited 2010-06-16 11:04:37 -07:00	93dc104209
Make NetworkStateTracker an interface ... As part of the WifiStateTracker cleanup, need to have NetworkStateTracker as an interface. Change-Id: I2ac48d7e4c7274ac4df40bc3b8591b182956a936 Irfan Sheriff   commited 2010-06-10 10:55:23 -07:00	7f132d9680