commit 54bdb2e732de98ae2829101570dc29970e377fa3
author Quddus Chong <quddusc@google.com> Tue Aug 18 22:03:21 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 18 22:03:21 2015 +0000
tree 73618eb8ac2800f47e1ebf4916c136389038475a
parent 886e7a63b122a30c69c663d32e3e5f880a07593e
parent 3166cc869ebd2d4a20156b573c17c94cff9b086c

Merge "docs: Updated hardware system images for M." into mnc-dev

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 6e0c37f..4919bed 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1585,7 +1585,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)) {