diff options
| author | 2015-08-19 01:32:46 +0000 | |
|---|---|---|
| committer | 2015-08-19 01:32:46 +0000 | |
| commit | 56df15d3b41e6599e174da92352d85d11f9155ee (patch) | |
| tree | c11a352efa90de3ee4d2cd58b28791587d86b17a | |
| parent | 40c758316302851a99cf6e285ed7b06497ac36f9 (diff) | |
| parent | 5b3a38e07dcdbae03f13a55d91a8936996ddc9cf (diff) | |
am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '5b3a38e07dcdbae03f13a55d91a8936996ddc9cf':
Change default cellular activity timeout to 10
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 921e71ecf1ca..e19447d062d3 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -1597,7 +1597,7 @@ public class ConnectivityService extends IConnectivityManager.Stub NetworkCapabilities.TRANSPORT_CELLULAR)) { timeout = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE, - 5); + 10); type = ConnectivityManager.TYPE_MOBILE; } else if (networkAgent.networkCapabilities.hasTransport( NetworkCapabilities.TRANSPORT_WIFI)) { |