summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* Harden NsdManager against null-dereference crashesDave Platt2014-03-041-19/+28
* Fix descriptor leak after accepting connectionsDave Platt2014-02-281-1/+1
* Use java.util.Objects instead on internal APIKenny Root2013-12-134-17/+18
* Merge "Add address flags and scope to LinkAddress."Lorenzo Colitti2013-12-073-34/+188
|\
| * Add address flags and scope to LinkAddress.Lorenzo Colitti2013-12-063-34/+188
* | Merge commit 'bac61807d3bcfff957b358cb9ad77850bd373689' into HEADThe Android Open Source Project2013-12-052-1/+2
|\ \ | |/ |/|
| * am 4c514f2a: am 594eeb08: Merge "Fix for the invalid Global Proxy Setting" in...Robert Greenwalt2013-11-131-0/+11
| |\
| | * Fix for the invalid Global Proxy SettingRaj Mamadgi2013-11-141-0/+11
| * | am cb134203: am 86f5a149: Merge "Change PacProxySelector to return unresolved...Jason Monk2013-10-311-1/+1
| |\ \ | | |/
| | * Change PacProxySelector to return unresolved addrJason Monk2013-10-311-1/+1
| * | am 56922039: am b4cae4a9: Merge "Fix SSLCertificateSocketFactory.getDefaultCi...Alex Klyubin2013-10-291-1/+1
| |\ \
* | | | Minor changes to LinkAddress.Lorenzo Colitti2013-12-031-24/+29
* | | | Use LinkAddress in address notifications.Lorenzo Colitti2013-11-261-2/+4
* | | | Pass DNS server info notifications to observers.Lorenzo Colitti2013-11-251-0/+9
* | | | Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEADThe Android Open Source Project2013-11-2229-264/+2270
|\ \ \ \ | |/ / /
| * | | am 6b57033b: am 8b81a638: Merge "getProxy in ConnectivityService returns port...Jason Monk2013-10-101-2/+5
| |\ \ \ | | | |/ | | |/|
| | * | getProxy in ConnectivityService returns port w/PACJason Monk2013-10-101-2/+5
| * | | am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-devRobert Greenwalt2013-10-041-1/+0
| |\ \ \ | | |/ /
| | * | Un-deprecate getDhcpInfoRobert Greenwalt2013-10-041-1/+0
| * | | am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile ...Wink Saville2013-10-031-10/+6
| |\ \ \ | | |/ /
| | * | Use networkType to display wifi and mobile notification separately.Wink Saville2013-10-031-10/+6
| * | | am 56065891: Merge commit \'53221120\' into fix-merge-conflictWink Saville2013-09-211-2/+7
| |\ \ \ | | |/ /
| | * | Merge commit '53221120' into fix-merge-conflictWink Saville2013-09-211-2/+7
| | |\ \
| | | * \ am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetw...Wink Saville2013-09-211-2/+4
| | | |\ \
| | | | * | Do not always call setIsConnectedToProvisioningNetwork(false)Wink Saville2013-09-211-2/+4
| * | | | | am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-devJason Monk2013-09-131-1/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Guarantee that PAC Local Proxy owns Port" into klp-devJason Monk2013-09-131-1/+9
| | |\ \ \ \
| | | * | | | Guarantee that PAC Local Proxy owns PortJason Monk2013-09-131-1/+9
| * | | | | | am 442a8753: am c3415a91: Merge "Remove ArpPeer; dead code from Google TV."Elliott Hughes2013-09-111-174/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge changes Ib1274847,I2eb2a1bf into klp-devJeff Sharkey2013-09-111-6/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Request all tethering interfaces, fix corruption.Jeff Sharkey2013-09-101-6/+0
| * | | | | | Add a hidden API to toggle airplane mode.Yuhao Zheng2013-09-102-0/+18
| |/ / / / /
| * | | | | Fix docs build.Ying Wang2013-09-061-1/+1
| * | | | | Setting MTU size for specific network.sy.yun2013-09-062-4/+33
| * | | | | am fc7a146b: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.Detai...Wink Saville2013-09-062-10/+33
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." in...Wink Saville2013-09-062-10/+33
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Do not change NetworkInfo.DetailedState.Wink Saville2013-09-052-10/+33
| * | | | | Merge "Add a function to replace all the link addresses." into klp-devLorenzo Colitti2013-09-051-0/+10
| |\ \ \ \ \
| | * | | | | Add a function to replace all the link addresses.Lorenzo Colitti2013-09-051-0/+10
| * | | | | | Merge "Rename LinkInfo to LinkQualityInfo" into klp-devVinit Deshapnde2013-09-0513-366/+797
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Rename LinkInfo to LinkQualityInfoVinit Deshapnde2013-09-0413-366/+797
| * | | | | | Add debug and remove SocketTimeoutException.Wink Saville2013-08-291-7/+4
| * | | | | | Merge commit '270226b0' into manualmergeWink Saville2013-08-295-157/+160
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | am 8cb2f42e: am 948282b0: Add support for handling mobile provisioning networks.Wink Saville2013-08-295-163/+155
| | |\ \ \ \ | | | |/ / /
| | | * | | Add support for handling mobile provisioning networks.Wink Saville2013-08-295-163/+155
| | * | | | am 33283a97: am dce52cdb: DO NOT MERGE: MDST is not ready until connected to ...Wink Saville2013-08-261-0/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | DO NOT MERGE: MDST is not ready until connected to DcTracker.Wink Saville2013-08-161-0/+7
| | * | | | am 61768c97: am 3870c570: Use hostname verifier directly instead of instance ...Kenny Root2013-08-131-4/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Use hostname verifier directly instead of instance DO NOT MERGEKenny Root2013-08-131-4/+1
| * | | | | Increase sampling data size limitsVinit Deshapnde2013-08-263-57/+62