summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* Remove dead code, mostly DataStateTracker.Paul Jensen2015-03-117-1908/+0
* am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWOR...Jeremy Joslin2015-02-121-0/+4
|\
| * Update Javadoc for EXTRA_NETWORK.Jeremy Joslin2015-02-111-0/+4
* | Merge "Also include the domain when parceling StaticIpConfiguration." automer...Lorenzo Colitti2015-01-301-0/+2
|\ \
| * | Also include the domain when parceling StaticIpConfiguration.Lorenzo Colitti2015-01-291-0/+2
| * | Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()Paul Jensen2015-01-292-2/+3
| * | Support connecting to networks with misconfigured subnet masks.Lorenzo Colitti2015-01-281-4/+11
* | | am 50f9d93a: am ae38596b: Merge "Support connecting to networks with misconfi...Lorenzo Colitti2015-01-231-4/+11
|\ \ \ | | |/ | |/|
| * | Merge "Support connecting to networks with misconfigured subnet masks." into ...Lorenzo Colitti2015-01-231-4/+11
| |\ \
| | * | Support connecting to networks with misconfigured subnet masks.Lorenzo Colitti2015-01-231-4/+11
* | | | am 78d51c22: Merge "Use the proper IpPrefix and LinkAddress constructors in V...Lorenzo Colitti2015-01-231-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Use the proper IpPrefix and LinkAddress constructors in VPN code." int...Lorenzo Colitti2015-01-231-1/+1
| |\ \ \ | | |/ /
| | * | Use the proper IpPrefix and LinkAddress constructors in VPN code.Lorenzo Colitti2015-01-231-1/+1
* | | | am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-devRobert Greenwalt2015-01-211-0/+5
|\ \ \ \ | |/ / /
| * | | Rerun entitlementcheck on sim change.Robert Greenwalt2015-01-141-0/+5
| |/ /
* | | am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build."Neil Fuller2015-01-201-9/+10
|\ \ \ | | |/ | |/|
| * | Fix for broken docs build.Neil Fuller2015-01-201-9/+10
* | | resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aospNeil Fuller2015-01-202-50/+60
|\ \ \ | |/ /
| * | Changes associated with an OkHttp upgradeNeil Fuller2015-01-202-50/+60
* | | am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when expiring or re...Paul Jensen2015-01-061-15/+18
|\ \ \ | | |/ | |/|
| * | Clear process DNS NetID binding when expiring or releaseing legacy requests.Paul Jensen2015-01-061-15/+18
* | | am bde00a2b: Merge "Add toString in NetworkFactory." into lmp-mr1-devRobert Greenwalt2014-12-111-0/+8
|\ \ \ | |/ /
| * | Merge "Add toString in NetworkFactory." into lmp-mr1-devRobert Greenwalt2014-12-111-0/+8
| |\ \
| | * | Add toString in NetworkFactory.Robert Greenwalt2014-12-101-0/+8
* | | | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-114-14/+75
|\ \ \ \ | |/ / /
| * | | Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-devPaul Jensen2014-12-114-14/+75
| |\ \ \
| | * | | Fix several HTTP proxy issues with multinetworking.Paul Jensen2014-12-104-14/+75
* | | | | am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functi...Erik Kline2014-12-101-13/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions." into lm...Erik Kline2014-12-101-13/+1
| |\ \ \ \
| | * | | | Re-remove CONNECTIVITY_CHANGE_DELAY and supporting functions.Erik Kline2014-12-081-13/+1
| * | | | | am b034de7e: am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docsElliott Hughes2014-12-091-7/+3
| |\ \ \ \ \
| | * \ \ \ \ am 12f100de: am e8f6cb06: Merge "Fix typo." into lmp-docsElliott Hughes2014-12-091-7/+3
| | |\ \ \ \ \
| | | * | | | | Fix typo.Elliott Hughes2014-12-091-7/+3
* | | | | | | | am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/setDataEnable...Wink Saville2014-12-091-1/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add subId as parameter for get/setDataEnabled." into lmp-mr1-devWink Saville2014-12-091-1/+8
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Add subId as parameter for get/setDataEnabled.Wink Saville2014-12-051-1/+8
* | | | | | | | am afc5b22c: am da30b545: Merge "Fix typo."Elliott Hughes2014-12-091-7/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Fix typo.Elliott Hughes2014-12-081-7/+3
* | | | | | | | am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface cha...Jeff Sharkey2014-12-093-0/+12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Direct notification of network interface changes.Jeff Sharkey2014-12-083-0/+12
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | am 5b41696c: am a8fb5803: Merge "Offer to "merge" subscribers for data usage....Jeff Sharkey2014-12-086-28/+98
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Offer to "merge" subscribers for data usage.Jeff Sharkey2014-12-086-28/+98
| | |_|_|_|/ | |/| | | |
* | | | | | am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIVITY_CHANGE_DE...Pavel Zhamaitsiak2014-12-081-1/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"Erik Kline2014-12-051-1/+13
| | |/ / / | |/| | |
* | | | | am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends...Erik Kline2014-12-041-13/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-devErik Kline2014-12-041-13/+1
| |\ \ \ \
| | * | | | Remove CONNECTIVITY_CHANGE_DELAY and friends.Erik Kline2014-10-311-13/+1
* | | | | | am 95e4474c: am 932c3321: Merge "Fix docs per API review." into lmp-mr1-devSreeram Ramachandran2014-12-031-7/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix docs per API review.Sreeram Ramachandran2014-12-031-7/+7
* | | | | | am d99cd44f: am dc99c504: Merge "Make StatusBar display all default networks....Lorenzo Colitti2014-12-033-1/+22
|\ \ \ \ \ \ | |/ / / / /
generated by cgit v1.1 at 2024-09-10 21:34:57 +0000