summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* am 70f998e5: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_S...Billy Lau2015-08-071-2/+3
|\
| * Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into...Billy Lau2015-08-071-2/+3
| |\
| | * Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGSBilly Lau2015-08-071-2/+3
* | | am 027e3b7f: Merge "Fix check for caller being the active network scorer" int...Shirish Kalele2015-08-071-7/+9
|\ \ \ | |/ /
| * | Merge "Fix check for caller being the active network scorer" into mnc-devShirish Kalele2015-08-071-7/+9
| |\ \
| | * | Fix check for caller being the active network scorerShirish Kalele2015-08-061-7/+9
* | | | resolved conflicts for merge of dbc4edcc to mnc-dr-devPaul Jensen2015-08-053-38/+39
|\ \ \ \ | |/ / /
| * | | Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-devPaul Jensen2015-08-053-42/+48
| |\ \ \ | | |_|/ | |/| |
| | * | Fix NOT_RESTRICTED network capability and enforce it.Paul Jensen2015-08-043-42/+48
* | | | am 692a244b: Fix build.Dianne Hackborn2015-07-311-4/+4
|\ \ \ \ | |/ / /
| * | | Fix build.Dianne Hackborn2015-07-311-4/+4
* | | | am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing method...Lorenzo Colitti2015-07-311-1/+43
|\ \ \ \ | |/ / /
| * | | Stop supporting legacy ConnectivityManager routing methods in M.Lorenzo Colitti2015-07-311-1/+43
| | |/ | |/|
* | | am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses ca...Paul Jensen2015-07-301-0/+1
|\ \ \ | |/ /
| * | Merge "Fix missing onLost NetworkCallbacks when network loses capability" int...Paul Jensen2015-07-301-0/+1
| |\ \
| | * | Fix missing onLost NetworkCallbacks when network loses capabilityPaul Jensen2015-07-281-0/+1
| | |/
* | | resolved conflicts for merge of 30813942 to mnc-dr-devPaul Jensen2015-07-291-0/+20
|\ \ \ | |/ /
| * | Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" ...Paul Jensen2015-07-291-0/+21
| |\ \
| | * | Disable WiFi autojoin when user decides via "Stay connected?" dialogPaul Jensen2015-07-161-0/+21
* | | | am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-devRobert Greenwalt2015-07-281-5/+1
|\ \ \ \ | |/ / /
| * | | Merge "Un-remove legacy ConnectivityManager API." into mnc-devRobert Greenwalt2015-07-281-5/+1
| |\ \ \
| | * | | Un-remove legacy ConnectivityManager API.Robert Greenwalt2015-07-281-5/+1
| | | |/ | | |/|
* | | | am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-devLorenzo Colitti2015-07-281-1/+12
|\ \ \ \ | |/ / /
| * | | Always check off-link connectivity in NetworkDiagnostics.Lorenzo Colitti2015-07-271-1/+12
| |/ /
* | | Pass signal strength thresholds inside a BundleErik Kline2015-07-181-1/+10
* | | Support NetworkCallbacks based on signal strength.Lorenzo Colitti2015-07-183-3/+115
* | | ConnectivityManager API for for packet keepalives.Lorenzo Colitti2015-07-183-5/+226
* | | Make immutable NetworkCapabilities more explicit.Lorenzo Colitti2015-07-181-12/+106
|/ /
* | Merge "Legacy VPN calls to require a userID" into mnc-devRobin Lee2015-07-101-1/+1
|\ \ | |/ |/|
| * Legacy VPN calls to require a userIDRobin Lee2015-07-071-1/+1
* | Merge "Enable EMERGENCY mobile connections." into mnc-devRobert Greenwalt2015-07-102-2/+4
|\ \
| * | Enable EMERGENCY mobile connections.Robert Greenwalt2015-07-092-2/+4
* | | Merge "Add android.net.CaptivePortal class for captive-portal-handling-app ca...Paul Jensen2015-07-104-100/+155
|\ \ \
| * | | Add android.net.CaptivePortal class for captive-portal-handling-app callbacksPaul Jensen2015-07-094-100/+155
* | | | Revive NetworkInfo's SUSPENDED state.Robert Greenwalt2015-07-081-35/+56
| |/ / |/| |
* | | Expose time-interval detail query on INetworkStatsSessionZoltan Szatmary-Ban2015-07-071-0/+2
| |/ |/|
* | Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) APIPaul Jensen2015-06-301-1/+14
|/
* Fix use of reachable DNS server logicErik Kline2015-06-301-1/+38
* Disallow requesting networks with mutable NetworkCapabilities.Paul Jensen2015-06-231-0/+20
* Add NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTALPaul Jensen2015-06-231-1/+7
* Merge "Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED." into mnc-devLorenzo Colitti2015-06-232-1/+2
|\
| * Re-hide onPreCheck and unhide NET_CAPABILITY_VALIDATED.Lorenzo Colitti2015-06-112-1/+2
* | Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, Pendin...Paul Jensen2015-06-201-1/+39
|\ \
| * | Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)Paul Jensen2015-06-181-1/+39
* | | Merge "system_server: add two child chains to firewall" into mnc-devXiaohui Chen2015-06-171-0/+11
|\ \ \
| * | | system_server: add two child chains to firewallXiaohui Chen2015-06-171-0/+11
* | | | Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc...Paul Jensen2015-06-163-81/+0
|\ \ \ \
| * | | | Remove dead hidden ConnectivityManager and NetworkInfo APIs.Paul Jensen2015-06-163-81/+0
| | |/ / | |/| |
* | | | Merge "Update file size formatting." into mnc-devJeff Sharkey2015-06-161-0/+2
|\ \ \ \
| * | | | Update file size formatting.Jeff Sharkey2015-06-151-0/+2
| |/ / /