commit daf7e5befdf829b3e8ef83e5a0af998859265091
author Adam Lesinski <adamlesinski@google.com> Wed Aug 19 00:53:35 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 19 00:53:35 2015 +0000
tree 36c01ab1d47d8db34bb8e24a995b8e533706434b
parent a0984c71a173718a864cb9d06a2a9176d989d1bf
parent 6d4ebd786f9b9521ab7b319fbdda178d0875673b

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

* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 921e71e..e19447d 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1597,7 +1597,7 @@
                 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)) {