am 01ed50f4: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '01ed50f414e3c2d042939774fe78e1585f915124': Change default cellular activity timeout to 10
2015-08-19 01:39:03 +00:00
parent 0876f4f3f5 01ed50f414
commit dc044a85f9
1 changed files with 1 additions and 1 deletions
--- 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)) {