summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* am a34b531b: Merge "EthernetDataTracker: Set network available on connected"Robert Greenwalt2013-05-151-0/+1
|\
| * Merge "EthernetDataTracker: Set network available on connected"Robert Greenwalt2013-05-151-0/+1
| |\
| | * EthernetDataTracker: Set network available on connectedPeter YOON2013-03-111-0/+1
* | | am 4f88ff48: Merge "Use the right fd for flush call" into jb-mr2-devMatthew Xie2013-05-141-1/+1
|\ \ \
| * | | Use the right fd for flush callMatthew Xie2013-05-131-1/+1
* | | | am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-devRobert Greenwalt2013-05-061-2/+1
|\ \ \ \ | |/ / /
| * | | Fix sync problem in NsdManagerRobert Greenwalt2013-05-021-2/+1
* | | | resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aospKenny Root2013-04-295-12/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Track change to JSSE providerKenny Root2013-04-295-12/+12
* | | | am d152f7ec: Merge "Don\'t use X509CertImpl directly"Kenny Root2013-04-291-3/+10
|\ \ \ \ | |/ / /
| * | | Don't use X509CertImpl directlyKenny Root2013-04-291-3/+10
* | | | am 7f3c5d16: Merge "Added flush() for bluetooth output stream" into jb-mr2-devMatthew Xie2013-04-251-0/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Added flush() for bluetooth output streamzzy2013-04-241-0/+20
* | | | am d0202945: Merge "Listen for network disconnect." into jb-mr2-devRobert Greenwalt2013-04-231-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Listen for network disconnect." into jb-mr2-devRobert Greenwalt2013-04-221-0/+2
| |\ \ \
| | * | | Listen for network disconnect.Robert Greenwalt2013-04-221-0/+2
* | | | | am 88cec86e: Remove STOPSHIP and defer removal.Robert Greenwalt2013-04-191-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove STOPSHIP and defer removal.Robert Greenwalt2013-04-191-2/+1
| |/ / /
* | | | am 3016244f: Merge "Add new route.hasGateway() api" into jb-mr2-devRobert Greenwalt2013-04-121-0/+7
|\ \ \ \ | |/ / /
| * | | Add new route.hasGateway() apiRobert Greenwalt2013-04-121-0/+7
* | | | am ccbe7e6f: Merge "Use CONNECTIVITY_INTERNAL for global proxy" into jb-mr2-devRobert Greenwalt2013-04-111-1/+1
|\ \ \ \ | |/ / /
| * | | Use CONNECTIVITY_INTERNAL for global proxyRobert Greenwalt2013-04-101-1/+1
* | | | am 0f8e8b03: Merge "Warn when exposing file:// Uris beyond a process." into j...Jeff Sharkey2013-04-031-0/+13
|\ \ \ \ | |/ / /
| * | | Merge "Warn when exposing file:// Uris beyond a process." into jb-mr2-devJeff Sharkey2013-04-031-0/+13
| |\ \ \
| | * | | Warn when exposing file:// Uris beyond a process.Jeff Sharkey2013-04-031-0/+13
* | | | | am 6fdcb168: Merge "Adjust the HttpResponseCache for OkHttp."Brian Carlstrom2013-04-031-7/+8
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Adjust the HttpResponseCache for OkHttp.jwilson2013-04-031-7/+8
* | | | Fix LinkProperties's equals() method.Lorenzo Colitti2013-04-021-1/+1
| |/ / |/| |
* | | Merge "Add BT - DataTracker connection" into jb-mr2-devRobert Greenwalt2013-03-287-13/+67
|\ \ \
| * | | Add BT - DataTracker connectionRobert Greenwalt2013-03-277-13/+67
* | | | Merge "Cleanup some debug in LinkCapabilities and Properties." into jb-mr2-devWink Saville2013-03-282-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Cleanup some debug in LinkCapabilities and Properties.Wink Saville2013-03-272-2/+2
* | | | Make isHostRoute match only host routesLorenzo Colitti2013-03-271-1/+4
|/ / /
* | | Update TrafficStats docs to reflect behavior.Jeff Sharkey2013-03-261-61/+72
* | | Prevent NPE in new API.Robert Greenwalt2013-03-221-1/+1
* | | Reset connections on all stacked interfaces.Lorenzo Colitti2013-03-201-0/+9
* | | Revert of Ifd0c4081a. Turning off logging.Robert Greenwalt2013-03-152-19/+0
* | | Merge "Revert "Turn on more logging to find this bug."" into jb-mr2-devRobert Greenwalt2013-03-151-1/+1
|\ \ \
| * | | Revert "Turn on more logging to find this bug."Robert Greenwalt2013-03-151-1/+1
* | | | Don't return an unmod collection.Robert Greenwalt2013-03-151-1/+1
* | | | Don't update routes if Dhcp fails.Robert Greenwalt2013-03-151-1/+1
* | | | Add stacking to the NetworkStateTrackers.Lorenzo Colitti2013-03-155-0/+50
* | | | Add stacked interfaces to LinkProperties.Lorenzo Colitti2013-03-151-6/+133
|/ / /
* | | Turn on more logging to find this bug.Robert Greenwalt2013-03-141-1/+1
* | | Add logging to track down bugRobert Greenwalt2013-03-132-1/+20
* | | Unit test routes with interfaces in LinkPropertiesLorenzo Colitti2013-03-121-3/+3
* | | am f3e3a7fd: am 7ad51409: Merge "Switch TLS Channel ID API from ECPrivateKey ...Kenny Root2013-03-121-4/+4
|\ \ \ | |/ /
| * | Switch TLS Channel ID API from ECPrivateKey to PrivateKey.Alex Klyubin2013-03-121-4/+4
| |/
* | Unbreak documentation build.Lorenzo Colitti2013-03-121-3/+3
* | Always specify an interface for host routes.Lorenzo Colitti2013-03-081-5/+5