summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/ConnectivityManager.java
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-101-43/+92
|\
| * Fix typos in ConnectivityManager documentation.Paul Jensen2015-04-071-27/+27
| * Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().Paul Jensen2015-04-031-1/+0
| * Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.Paul Jensen2015-04-021-15/+65
* | Move reset network settings into framework.Stuart Scott2015-03-301-0/+33
* | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-241-1/+1
|\ \ | |/
| * Remove dead code, mostly DataStateTracker.Paul Jensen2015-03-181-33/+0
| * Fix javadoc braces for ConnectivityManager.EXTRA_NETWORK.Paul Jensen2015-03-131-1/+1
* | resolved conflicts for merge of b6b9fe21 to masterAndreas Gampe2015-03-131-33/+0
|\ \
| * | Remove dead code, mostly DataStateTracker.Paul Jensen2015-03-111-33/+0
| |/
* | Remove unused imports in frameworks/base.John Spurlock2015-02-281-2/+0
* | am f69f3737: am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for...Jeremy Joslin2015-02-121-0/+4
|\ \ | |/
| * Update Javadoc for EXTRA_NETWORK.Jeremy Joslin2015-02-111-0/+4
* | am 932bfab9: am 6c93739f: am 9ffb53cb: Clear process DNS NetID binding when e...Paul Jensen2015-01-061-15/+18
|\ \ | |/
| * Clear process DNS NetID binding when expiring or releaseing legacy requests.Paul Jensen2015-01-061-15/+18
* | am 2122e14c: Merge "Fix several HTTP proxy issues with multinetworking." into...Paul Jensen2014-12-111-9/+38
|\ \ | |/
| * Merge "Fix several HTTP proxy issues with multinetworking." into lmp-mr1-devPaul Jensen2014-12-111-9/+38
| |\
| | * Fix several HTTP proxy issues with multinetworking.Paul Jensen2014-12-101-9/+38
* | | am 34b3b53f: am 33cd463b: Merge "Re-remove CONNECTIVITY_CHANGE_DELAY and supp...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 7a4df2b7: am 2f5cb843: am 15b29ac7: Merge "Add subId as parameter for get/...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 913c9895: am d89f0d3d: am b81ce34a: Merge "Revert "Merge "Remove CONNECTIV...Pavel Zhamaitsiak2014-12-091-1/+13
|\ \ \ | |/ /
| * | Revert "Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev"Erik Kline2014-12-051-1/+13
| |/
* | am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELA...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 45cd4df6: am d99cd44f: am dc99c504: Merge "Make StatusBar display all defa...Lorenzo Colitti2014-12-031-0/+13
|\ \ \ | |/ /
| * | Make StatusBar display all default networks.Lorenzo Colitti2014-12-021-0/+13
* | | am d8b011a3: am d125266b: am f27b52aa: Merge "Revert some verbose logging fro...Erik Kline2014-12-021-9/+0
|\ \ \ | |/ /
| * | Revert some verbose logging from ag/489226Erik Kline2014-11-261-9/+0
* | | Merge "Map TYPE_VPN integer to "VPN" string."Erik Kline2014-11-251-0/+2
|\ \ \ | |/ / |/| |
| * | Map TYPE_VPN integer to "VPN" string.Erik Kline2014-11-251-0/+2
* | | Delete unused/non-working code.Sreeram Ramachandran2014-11-211-39/+0
|/ /
* | Rename EXTRA_NETWORK ConnectivityManager constants.Erik Kline2014-11-201-5/+4
* | Implemented requestNetwork with a PendingIntent.Jeremy Joslin2014-11-061-9/+32
* | Fix Legacy typing of net-specific requests.Robert Greenwalt2014-11-051-46/+43
|/
* Send callbacks for Net property changesRobert Greenwalt2014-10-021-30/+33
* Move mobile provisioning APN support into telephony.Paul Jensen2014-09-291-2/+2
* Use unified Tethering Permission CheckRobert Greenwalt2014-09-171-0/+14
* Flush HTTP socket pools and DNS cache when binding process to a Network.Paul Jensen2014-09-101-1/+16
* Fix networking API per scripting checks.Robert Greenwalt2014-09-041-4/+4
* Pass the socket mark for DNS queries to dnsmasq.Lorenzo Colitti2014-08-291-0/+17
* Remove captive portal sign-in actions.Paul Jensen2014-08-221-92/+0
* Implement support for bypassable VPNs.Sreeram Ramachandran2014-07-251-2/+2
* Fix DUN-based tethering.Robert Greenwalt2014-07-241-1/+1
* Infer legacy network type for ConnectivityManager.requestNetworkYe Wen2014-07-231-3/+62
* Cleanup: Delete dead code.Sreeram Ramachandran2014-07-221-30/+3