summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/ConnectivityManager.java
Commit message (Expand)AuthorAgeFilesLines
* Fix javadoc error for requestNetwork.Lorenzo Colitti2015-05-011-12/+17
* Simplify network callback handling code.Lorenzo Colitti2015-05-011-64/+36
* Document and unhide CALLBACK_PRECHECK.Lorenzo Colitti2015-05-011-4/+12
* Merge commit '25a217c' into merge2Etan Cohen2015-04-241-0/+114
|\
| * Add captive portal API.Paul Jensen2015-04-161-0/+114
| * LCE service implementation - connectivity sidefenglu2015-04-151-0/+17
* | Merge commit '9561e74' into merge2Etan Cohen2015-04-241-4/+17
|\ \ | |/
| * Deprecate connectivity APIs relying on integer network types.Paul Jensen2015-04-141-4/+17
* | @removed requestRouteToHost and {start,stop}UsingNetworkFeatureLorenzo Colitti2015-04-231-11/+22
* | Don't require ACCESS_NETWORK_STATE in setProcessDefaultNetworkLorenzo Colitti2015-04-221-1/+6
* | Merge "update API name to requestBandwidthUpdate()"fenglu2015-04-221-6/+10
|\ \
| * | update API name to requestBandwidthUpdate()fenglu2015-04-211-6/+10
* | | Merge "Revert "requestBwUpdate() public API review""Robert Greenwalt2015-04-211-9/+7
|\ \ \
| * | | Revert "requestBwUpdate() public API review"Robert Greenwalt2015-04-211-9/+7
* | | | Merge "requestBwUpdate() public API review"Robert Greenwalt2015-04-211-7/+9
|\ \ \ \ | |/ / /
| * | | requestBwUpdate() public API reviewfenglu2015-04-211-7/+9
| |/ /
* | | Final removal of CONNECTIVITY_ACTION_IMMEDIATE.Erik Kline2015-04-211-10/+0
* | | Move factoryReset to service and protect.Stuart Scott2015-04-201-23/+1
|/ /
* | LCE service implementation - connectivity sidefenglu2015-04-161-0/+17
* | Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release"Vinit Deshpande2015-04-161-47/+55
|\ \
| * \ am b5e0cfb..557d2f5 from mirror-m-wireless-internal-releaseVinit Deshpande2015-04-141-47/+55
| |\ \ | | |/
| | * Add ConnectivityManager.reportNetworkConnectivity() APIPaul Jensen2015-04-131-1/+24
| | * Add ConnectivityManager.getActiveNetwork().Paul Jensen2015-04-101-4/+31
| | * Non-functional code cleanup of ConnectivityService.Paul Jensen2015-04-081-42/+0
* | | Prompt if a network without an Internet connection is selectedLorenzo Colitti2015-04-151-0/+31
|/ /
* | 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
|\ \ \ | |/ /