summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* am e572a77f: am fa36b36c: Merge "Deprecate more apache-http." into lmp-mr1-devNarayan Kamath2014-10-244-7/+31
|\
| * Merge "Deprecate more apache-http." into lmp-mr1-devNarayan Kamath2014-10-244-7/+31
| |\
| | * Deprecate more apache-http.Narayan Kamath2014-10-234-7/+31
* | | am b9248a55: am b1df48e4: Merge "Add an API to select a network for a Datagra...Sreeram Ramachandran2014-10-231-3/+27
|\ \ \ | |/ /
| * | Add an API to select a network for a DatagramSocket.Sreeram Ramachandran2014-10-231-3/+27
| |/
* | am a9ba8347: am eb35fa56: am 3515ab80: am 24861eab: Merge "Send callbacks for...Robert Greenwalt2014-10-031-30/+33
|\ \ | |/
| * am 24861eab: Merge "Send callbacks for Net property changes" into lmp-devRobert Greenwalt2014-10-031-30/+33
| |\
| | * Merge "Send callbacks for Net property changes" into lmp-devRobert Greenwalt2014-10-031-30/+33
| | |\
| | | * Send callbacks for Net property changesRobert Greenwalt2014-10-021-30/+33
* | | | am 58f75627: am 94f5155d: am c68aad9f: am d84ce32b: Merge "Fix some documenta...Newton Allen2014-10-021-6/+6
|\ \ \ \ | |/ / /
| * | | am d84ce32b: Merge "Fix some documentation typos." into lmp-devNewton Allen2014-10-021-6/+6
| |\ \ \ | | |/ /
| | * | Fix some documentation typos.Newton Allen2014-09-301-6/+6
| | |/
* | | am 52786d9b: am 5aa788a6: am a621a97f: am 89e0f093: Move mobile provisioning ...Paul Jensen2014-09-302-4/+3
|\ \ \ | |/ /
| * | am 89e0f093: Move mobile provisioning APN support into telephony.Paul Jensen2014-09-292-4/+3
| |\ \ | | |/
| | * Move mobile provisioning APN support into telephony.Paul Jensen2014-09-292-4/+3
* | | am 19733a32: am c17062e5: am 71915080: am 6974f6a9: Merge "Block address fami...Lorenzo Colitti2014-09-241-31/+2
|\ \ \ | |/ /
| * | am 6974f6a9: Merge "Block address families with routes, not NetworkAgent side...Lorenzo Colitti2014-09-241-31/+2
| |\ \ | | |/
| | * Block address families with routes, not NetworkAgent side channelLorenzo Colitti2014-09-231-31/+2
* | | am d0d59156: am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I...Lorenzo Colitti2014-09-233-10/+88
|\ \ \ | |/ /
| * | am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-devLorenzo Colitti2014-09-233-10/+88
| |\ \ | | |/
| | * Support non-unicast route types: unreachable and throw.Lorenzo Colitti2014-09-223-10/+88
* | | am d428d7bf: am 7491d876: am 7f969e42: Merge "Cleanup NetworkCapabilities." i...Wink Saville2014-09-231-13/+6
|\ \ \ | |/ /
| * | Cleanup NetworkCapabilities.Wink Saville2014-09-221-13/+6
| |/
* | am ad64befd: am 296a712e: Merge "Make a field final."Ian Rogers2014-09-191-1/+1
|\ \ | |/ |/|
| * am 296a712e: Merge "Make a field final."Ian Rogers2014-09-191-1/+1
| |\
| | * Make a field final.Ian Rogers2014-08-271-1/+1
| * | am 52a154fe: Merge "Remove"Brian Carlstrom2014-07-074-165/+23
| |\ \ | | |/
| | * RemoveBrian Carlstrom2014-07-074-165/+23
| * | am 42b74e23: Merge "Typo in method name: Clone"Nick Kralevich2014-07-051-1/+1
| |\ \ | | |/
| | * Merge "Typo in method name: Clone"Nick Kralevich2014-07-021-1/+1
| | |\
| | | * Typo in method name: CloneYou Kim2013-08-291-1/+1
| | * | DO NOT MERGE refactor wifi p2p's startDhcpServer functionJianzheng Zhou2014-06-232-0/+19
| |/ /
* | | Merge "Use unified Tethering Permission Check" into lmp-devRobert Greenwalt2014-09-181-0/+14
|\ \ \
| * | | Use unified Tethering Permission CheckRobert Greenwalt2014-09-171-0/+14
* | | | Merge "NetworkStats always needs arrays." into lmp-devJeff Sharkey2014-09-171-0/+11
|\ \ \ \
| * | | | NetworkStats always needs arrays.Jeff Sharkey2014-09-171-0/+11
| |/ / /
* | | | Add NetworkAgent event for ExplicitlySelectedRobert Greenwalt2014-09-162-0/+38
* | | | Merge "Report Network status to NetworkAgent." into lmp-devRobert Greenwalt2014-09-161-0/+38
|\ \ \ \ | |/ / / |/| | |
| * | | Report Network status to NetworkAgent.Robert Greenwalt2014-09-141-0/+38
* | | | Fix a typo in comment.Ang Li2014-09-151-2/+1
|/ / /
* | | Merge "Update VpnService Javadoc to reflect new UX." into lmp-devJeff Davidson2014-09-111-4/+10
|\ \ \
| * | | Update VpnService Javadoc to reflect new UX.Jeff Davidson2014-09-111-4/+10
* | | | Hide mutable VpnService APIs to add/remove IP addresses dynamically.Sreeram Ramachandran2014-09-111-0/+4
* | | | Merge "Flush HTTP socket pools and DNS cache when binding process to a Networ...Paul Jensen2014-09-111-1/+16
|\ \ \ \
| * | | | Flush HTTP socket pools and DNS cache when binding process to a Network.Paul Jensen2014-09-101-1/+16
| |/ / /
* | | | Make Network.openConnection() share HttpHandlers not OkHttpClients.Paul Jensen2014-09-111-28/+40
* | | | Don't accept score below 0.Robert Greenwalt2014-09-101-0/+3
|/ / /
* | | Fix networking API per scripting checks.Robert Greenwalt2014-09-042-7/+4
* | | Merge "Catch creation of NetworkRequest without NetCap" into lmp-devRobert Greenwalt2014-09-041-0/+3
|\ \ \
| * | | Catch creation of NetworkRequest without NetCapRobert Greenwalt2014-09-031-0/+3