summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* am ad44d814: am 3dc08220: am b57f236e: Merge changes Icf7d67e2,Ia914ec88,I249...Lorenzo Colitti2015-05-012-82/+82
|\
| * Add a hidden method to clear NetworkCapabilities.Lorenzo Colitti2015-05-011-2/+17
| * 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
| * Fix incorrect javadoc for Uri.getQueryParameter.Narayan Kamath2015-04-301-1/+1
* | am 278886d5: am 3184b286: am fa4eda44: Merge "Remove network access for idle ...Amith Yamasani2015-04-291-1/+11
|\ \
| * \ am 3184b286: am fa4eda44: Merge "Remove network access for idle apps" into mn...Amith Yamasani2015-04-291-1/+11
| |\ \ | | |/
| | * Remove network access for idle appsAmith Yamasani2015-04-291-1/+11
* | | am 8756f9b3: am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power s...Dianne Hackborn2015-04-292-10/+0
|\ \ \ | |/ /
| * | am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist...Dianne Hackborn2015-04-292-10/+0
| |\ \ | | |/
| | * Implement user-settable power save whitelist.Dianne Hackborn2015-04-292-10/+0
* | | Fix the javadoc for requestBandwidthUpdate(...)fenglu2015-04-271-1/+1
* | | Merge "API review for requestBandwidthUpdate()"fenglu2015-04-271-2/+0
|\ \ \ | |/ / |/| |
| * | API review for requestBandwidthUpdate()fenglu2015-04-211-2/+0
* | | am cf6fc5ee: Merge "Fix incorrect javadoc for Uri.getQueryParameter."Narayan Kamath2015-04-271-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix incorrect javadoc for Uri.getQueryParameter.Narayan Kamath2015-04-271-1/+1
* | | Merge commit '25a217c' into merge2Etan Cohen2015-04-242-0/+116
|\ \ \
| * | | Add captive portal API.Paul Jensen2015-04-162-0/+116
| * | | LCE service implementation - connectivity sidefenglu2015-04-153-0/+45
| * | | multinetwork API: native implementationErik Kline2015-04-151-0/+29
* | | | 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-222-7/+11
|\ \ \
| * | | update API name to requestBandwidthUpdate()fenglu2015-04-212-7/+11
* | | | Merge "Revert "requestBwUpdate() public API review""Robert Greenwalt2015-04-212-10/+8
|\ \ \ \
| * | | | Revert "requestBwUpdate() public API review"Robert Greenwalt2015-04-212-10/+8
* | | | | Merge "requestBwUpdate() public API review"Robert Greenwalt2015-04-212-8/+10
|\ \ \ \ \ | |/ / / /
| * | | | requestBwUpdate() public API reviewfenglu2015-04-212-8/+10
| |/ / /
* | | | Final removal of CONNECTIVITY_ACTION_IMMEDIATE.Erik Kline2015-04-211-10/+0
* | | | Move factoryReset to service and protect.Stuart Scott2015-04-204-41/+8
* | | | Add OP_READ_PHONE_STATE app op - frameworkSvet Ganov2015-04-172-3/+5
|/ / /
* | | LCE service implementation - connectivity sidefenglu2015-04-163-0/+43
* | | Merge "am b5e0cfb..557d2f5 from mirror-m-wireless-internal-release"Vinit Deshpande2015-04-163-52/+63
|\ \ \
| * \ \ am b5e0cfb..557d2f5 from mirror-m-wireless-internal-releaseVinit Deshpande2015-04-143-52/+63
| |\ \ \ | | |/ /
| | * | Add ConnectivityManager.reportNetworkConnectivity() APIPaul Jensen2015-04-132-2/+25
| | * | Add ConnectivityManager.getActiveNetwork().Paul Jensen2015-04-103-6/+38
| | * | Non-functional code cleanup of ConnectivityService.Paul Jensen2015-04-082-44/+0
* | | | Merge changes from topic 'no_internet'Lorenzo Colitti2015-04-154-4/+78
|\ \ \ \
| * | | | Prompt if a network without an Internet connection is selectedLorenzo Colitti2015-04-154-4/+78
| |/ / /
* | | | multinetwork API: native implementationErik Kline2015-04-151-0/+29
|/ / /
* | | am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contai...Erik Kline2015-04-142-7/+16
|\ \ \ | | |/ | |/|
| * | Add android.net.IpPrefix#contains()Erik Kline2015-04-142-7/+16
* | | Merge commit 'e593d0a' into merge_workPrerepa Viswanadham2015-04-106-115/+229
|\ \ \ | | |/ | |/|
| * | Unhide Network.openConnection(URL, Proxy).Lorenzo Colitti2015-04-071-1/+0
| * | Fix typos in ConnectivityManager documentation.Paul Jensen2015-04-071-27/+27
| * | Deprecate EXTRA_PROXY_INFO and unhide ConnectivityManager.getDefaultProxy().Paul Jensen2015-04-032-9/+8
| * | Deprecate static ConnectivityManager.get/setProcessDefaultNetwork() functions.Paul Jensen2015-04-024-21/+74