diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-08-18 20:43:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-18 20:43:34 +0000 |
| commit | 886e7a63b122a30c69c663d32e3e5f880a07593e (patch) | |
| tree | 6484151f25f89ad608c150ffa05bc0d1dba23c34 /services | |
| parent | 448216e7b8822ae9c1c44836482c95f2becc220d (diff) | |
| parent | ed6160d299dadb4898360d55b2fb14e69ebb7ab3 (diff) | |
| download | frameworks_base-886e7a63b122a30c69c663d32e3e5f880a07593e.zip frameworks_base-886e7a63b122a30c69c663d32e3e5f880a07593e.tar.gz frameworks_base-886e7a63b122a30c69c663d32e3e5f880a07593e.tar.bz2 | |
Merge "Change default cellular activity timeout to 10" into mnc-dev
Diffstat (limited to 'services')
| -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 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 @@ 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)) { |