diff options
| author | 2015-08-19 00:53:35 +0000 | |
|---|---|---|
| committer | 2015-08-19 00:53:35 +0000 | |
| commit | bda9b324c88b70514109f2d9ffc937ca3202fd03 (patch) | |
| tree | f2c4d7208e44e996350829f771cb44991299dc35 | |
| parent | ee2cfe48d4fb36906c59c2ae545808dba01f90d8 (diff) | |
| parent | 886e7a63b122a30c69c663d32e3e5f880a07593e (diff) | |
am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
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)) { |