Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56df15d3 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity... 

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

* commit '5b3a38e0':
  Change default cellular activity timeout to 10
parents 40c75831 5b3a38e0

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

+1 −1
Original line number Diff line number Diff line
@@ -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)) {