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

* commit '886e7a63b122a30c69c663d32e3e5f880a07593e':
  Change default cellular activity timeout to 10
This commit is contained in:
Adam Lesinski
2015-08-19 00:53:35 +00:00
committed by Android Git Automerger

View File

@@ -1597,7 +1597,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
NetworkCapabilities.TRANSPORT_CELLULAR)) { NetworkCapabilities.TRANSPORT_CELLULAR)) {
timeout = Settings.Global.getInt(mContext.getContentResolver(), timeout = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE, Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE,
5); 10);
type = ConnectivityManager.TYPE_MOBILE; type = ConnectivityManager.TYPE_MOBILE;
} else if (networkAgent.networkCapabilities.hasTransport( } else if (networkAgent.networkCapabilities.hasTransport(
NetworkCapabilities.TRANSPORT_WIFI)) { NetworkCapabilities.TRANSPORT_WIFI)) {