am 3170650a: am 56df15d3: am 5b3a38e0: am daf7e5be: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '3170650a2b611f175e401634436c650a56d957e9':
  Change default cellular activity timeout to 10
This commit is contained in:
Adam Lesinski
2015-08-19 02:22:12 +00:00
committed by Android Git Automerger

View File

@@ -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)) {