summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTERobert Greenwalt2011-09-092-1/+18
|\
| * Make copies of NetworkInfo to give out.Robert Greenwalt2011-09-092-1/+18
* | am 0d8acea9: Make copy-constructor make deep copy.Robert Greenwalt2011-07-291-3/+3
|\ \ | |/
| * Make copy-constructor make deep copy.Robert Greenwalt2011-07-281-3/+3
| * Merge "Use dns proxy a bit." into honeycomb-LTERobert Greenwalt2011-07-261-0/+15
| |\
| | * Use dns proxy a bit.Robert Greenwalt2011-07-251-0/+15
* | | Fix build.Robert Greenwalt2011-07-251-0/+15
|/ /
* | Add better routes for secondary DNSRobert Greenwalt2011-07-221-2/+2
|/
* Apply the dns and route diff which we get a changeRobert Greenwalt2011-07-142-13/+88
* Remove STOPSHIP but allow seamless Handoff when possible.Wink Saville2011-07-131-27/+110
* Use resetConnections with resetMask.Wink Saville2011-07-071-2/+16
* am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2Irfan Sheriff2011-06-221-1/+9
|\
| * Release wakelock after useIrfan Sheriff2011-06-211-1/+9
* | am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-221-7/+18
|\ \ | |/
| * Revert "DO NOT MERGE Revert "Fix lease duration handling""Irfan Sheriff2011-06-211-7/+18
* | resolved conflicts for merge of 914ed90f to honeycomb-LTEIrfan Sheriff2011-06-222-0/+363
|\ \ | |/
| * Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""Irfan Sheriff2011-06-212-0/+363
* | resolved conflicts for merge of 267a6181 to honeycomb-LTEIrfan Sheriff2011-06-222-363/+0
|\ \ | |/
| * DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"Irfan Sheriff2011-06-212-363/+0
* | am bc4ddef4: Merge "DO NOT MERGE Revert "Fix lease duration handling"" into h...Irfan Sheriff2011-06-211-18/+7
|\ \ | |/
| * DO NOT MERGE Revert "Fix lease duration handling"Irfan Sheriff2011-06-211-18/+7
* | Fix tethering upstream determination.Robert Greenwalt2011-06-201-0/+6
* | Merge "Reset connections AFTER we take down the network." into honeycomb-LTERobert Greenwalt2011-06-161-41/+0
|\ \
| * | Reset connections AFTER we take down the network.Robert Greenwalt2011-06-161-41/+0
* | | am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2Irfan Sheriff2011-06-151-7/+18
|\ \ \ | |/ / |/| / | |/
| * Fix lease duration handlingIrfan Sheriff2011-06-151-7/+18
* | resolved conflicts for merge of 8de47a2f to honeycomb-LTERobert Greenwalt2011-06-071-9/+9
|\ \ | |/
| * Reveal some network constants.Robert Greenwalt2011-05-311-9/+9
| * DO NOT MERGE Add DhcpStateMachineIrfan Sheriff2011-05-122-0/+363
* | Merge "Reset connection while data state changed." into honeycomb-LTEWink Saville2011-05-192-1/+29
|\ \
| * | Reset connection while data state changed.Wink Saville2011-05-182-1/+29
* | | Switch to use netd to add/remove routes.Robert Greenwalt2011-05-182-90/+52
|/ /
* | Linkproperties update via unsol data call state change.Kazuhiro Ondo2011-05-171-0/+15
* | Fix initialization of RouteInfoKazuhiro Ondo2011-05-111-3/+15
* | Fix the adding of host routes.Robert Greenwalt2011-05-102-17/+96
* | Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTERobert Greenwalt2011-05-041-1/+9
|\ \
| * | Add auto-restore timeout for secondary networks.Robert Greenwalt2011-05-031-1/+9
* | | Merge "Add RouteInfo objects for tracking routes." into honeycomb-LTERobert Greenwalt2011-05-024-28/+222
|\ \ \
| * | | Add RouteInfo objects for tracking routes.Robert Greenwalt2011-05-024-28/+222
| |/ /
* | | Add DhcpStateMachine for interation with dhcpcdIrfan Sheriff2011-04-302-0/+363
|/ /
* | Make new networkAttribute parameter non-optional.Robert Greenwalt2011-04-251-5/+1
* | EthernetDataTracker: implement setDependencyMetBenoit Goby2011-04-111-0/+4
* | resolved conflicts for merge of 08c39c6a to honeycomb-LTEBenoit Goby2011-04-111-0/+333
|\ \ | |/
| * Add support for USB Ethernet adaptersBenoit Goby2011-04-112-2/+335
* | Merge "Add external dependency API." into honeycomb-LTERobert Greenwalt2011-04-076-0/+119
|\ \
| * | Add external dependency API.Robert Greenwalt2011-04-076-0/+119
* | | Make LinkProperties comparable.John Wang2011-04-073-4/+81
|/ /
* | Do not merge: Add some input checking to prevent problemsRobert Greenwalt2011-03-141-3/+3
* | Do not merge: Revert the revert of "LTE Changes for Telephony including Multi...Wink Saville2011-03-142-5/+32
|/
* DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN suppor...Wink Saville2011-03-032-32/+5